commit
6b5fbdcec5
|
@ -58,6 +58,7 @@
|
|||
<field name="price_unit" select="1"/>
|
||||
<field name="discount"/>
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<field colspan="4" name="origin" select="1"/>
|
||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/>
|
||||
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
|
||||
<newline/>
|
||||
|
|
|
@ -676,7 +676,83 @@ class account_move_line(osv.osv):
|
|||
if update_check:
|
||||
if ('account_id' in vals) or ('journal_id' in vals) or ('period_id' in vals) or ('move_id' in vals) or ('debit' in vals) or ('credit' in vals) or ('date' in vals):
|
||||
self._update_check(cr, uid, ids, context)
|
||||
|
||||
obj_line=self.browse(cr, uid, ids[0])
|
||||
lines={}
|
||||
|
||||
obj_analytic_line=self.pool.get('account.analytic.line')
|
||||
analytic=True
|
||||
journal_flag=False
|
||||
del_line=False
|
||||
|
||||
if ('journal_id' in vals):
|
||||
journal=self.pool.get('account.journal').browse(cr,uid,vals['journal_id'])
|
||||
journal_flag=True
|
||||
if not journal.analytic_journal_id:
|
||||
del_line=True
|
||||
|
||||
if ('analytic_account_id' in vals) and (not vals['analytic_account_id']):
|
||||
del_line=True
|
||||
|
||||
if del_line:
|
||||
for obj in obj_line.analytic_lines:
|
||||
obj_analytic_line.unlink(cr,uid,obj.id)
|
||||
analytic=False
|
||||
|
||||
if obj_line.analytic_lines:
|
||||
mode='write'
|
||||
else:
|
||||
mode='create'
|
||||
|
||||
if obj_line.analytic_lines and analytic:
|
||||
if ('analytic_account_id' in vals):
|
||||
lines['account_id'] = vals['analytic_account_id']
|
||||
|
||||
if ('account_id' in vals):
|
||||
lines['general_account_id'] = vals['account_id']
|
||||
|
||||
if ('name' in vals):
|
||||
lines['name'] = vals['name']
|
||||
|
||||
if ('date' in vals):
|
||||
lines['date'] = vals['date']
|
||||
|
||||
if ('ref' in vals and vals['ref']):
|
||||
lines['ref'] = vals['ref']
|
||||
|
||||
if ('quantity' in vals and vals['quantity']):
|
||||
lines['unit_amount'] = vals['quantity']
|
||||
|
||||
if ('credit' in vals and vals['credit']):
|
||||
lines['amount'] = vals['credit']
|
||||
|
||||
if ('debit' in vals and vals['debit']):
|
||||
lines['amount'] = vals['debit']
|
||||
|
||||
if journal_flag:
|
||||
lines['journal_id']=journal.analytic_journal_id.id
|
||||
|
||||
if lines:
|
||||
if mode=='write':
|
||||
obj_analytic_line.write(cr,uid,obj_line.analytic_lines[0].id,lines,context)
|
||||
|
||||
result = super(osv.osv, self).write(cr, uid, ids, vals, context)
|
||||
|
||||
if mode=='create' and analytic and obj_line.analytic_account_id:
|
||||
if obj_line.journal_id.analytic_journal_id:
|
||||
vals_lines={
|
||||
'name': obj_line.name,
|
||||
'date': obj_line.date,
|
||||
'account_id': obj_line.analytic_account_id.id,
|
||||
'unit_amount':obj_line.quantity,
|
||||
'amount': obj_line.debit or obj_line.credit,
|
||||
'general_account_id': obj_line.account_id.id,
|
||||
'journal_id': obj_line.journal_id.analytic_journal_id.id,
|
||||
'ref': obj_line.ref,
|
||||
'move_id':obj_line.id
|
||||
}
|
||||
obj_analytic_line.create(cr,uid,vals_lines)
|
||||
|
||||
if check:
|
||||
done = []
|
||||
for line in self.browse(cr, uid, ids):
|
||||
|
@ -786,20 +862,20 @@ class account_move_line(osv.osv):
|
|||
if not ok:
|
||||
raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
|
||||
|
||||
result = super(osv.osv, self).create(cr, uid, vals, context)
|
||||
# result = super(osv.osv, self).create(cr, uid, vals, context)
|
||||
if 'analytic_account_id' in vals and vals['analytic_account_id']:
|
||||
if journal.analytic_journal_id:
|
||||
vals['analytic_lines'] = [(0,0, {
|
||||
'name': vals['name'],
|
||||
'date': vals['date'],
|
||||
'account_id': vals['analytic_account_id'],
|
||||
'unit_amount': vals['quantity'],
|
||||
'unit_amount':'quantity' in vals and vals['quantity'] or 1.0,
|
||||
'amount': vals['debit'] or vals['credit'],
|
||||
'general_account_id': vals['account_id'],
|
||||
'journal_id': journal.analytic_journal_id.id,
|
||||
'ref': vals['ref'],
|
||||
})]
|
||||
|
||||
result = super(osv.osv, self).create(cr, uid, vals, context)
|
||||
# CREATE Taxes
|
||||
if 'account_tax_id' in vals and vals['account_tax_id']:
|
||||
tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
|
||||
|
|
|
@ -716,10 +716,10 @@
|
|||
<page string="Analytic Lines">
|
||||
<field colspan="4" name="analytic_lines" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Move Lines">
|
||||
<!--<page string="Move Lines">
|
||||
<field colspan="4" name="reconcile_implicit"/>
|
||||
<field colspan="4" name="parent_move_lines" nolabel="0"/>
|
||||
</page>
|
||||
</page>-->
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -861,6 +861,7 @@ class account_invoice_line(osv.osv):
|
|||
_description = "Invoice line"
|
||||
_columns = {
|
||||
'name': fields.char('Description', size=256, required=True),
|
||||
'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
|
||||
'invoice_id': fields.many2one('account.invoice', 'Invoice Ref', ondelete='cascade', select=True),
|
||||
'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
|
||||
'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_analytic_analysis
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 12:57+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -18,11 +18,9 @@ msgstr ""
|
|||
|
||||
#. module: account_analytic_analysis
|
||||
#: constraint:ir.model:0
|
||||
msgid ""
|
||||
"The Object name must start with x_ and not contain any special character !"
|
||||
msgid "The Object name must start with x_ and not contain any special character !"
|
||||
msgstr ""
|
||||
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
|
||||
"spéciaux !"
|
||||
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,remaining_ca:0
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_analytic_default
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 13:01+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_analytic_plans
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 13:24+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_balance
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 14:13+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:26+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 10:30+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_date_check
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-10 06:24+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_followup
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:26+0000\n"
|
||||
"PO-Revision-Date: 2008-10-10 06:38+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_invoice_layout
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:12+0000\n"
|
||||
"PO-Revision-Date: 2008-10-10 06:56+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_payment
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-10 08:14+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_report
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-10 08:15+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * account_reporting
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:32+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 14:29+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:27+0000\n"
|
||||
"PO-Revision-Date: 2008-10-09 20:00+0000\n"
|
||||
"Last-Translator: Fabien Pinckaers <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-10-28 11:52:53+0000\n"
|
||||
"PO-Revision-Date: 2008-10-28 11:52:53+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 15:04+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * base_contact
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:33+0000\n"
|
||||
"PO-Revision-Date: 2008-10-08 14:13+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * base_iban
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-10 15:05:34+0000\n"
|
||||
"PO-Revision-Date: 2008-09-10 15:05:34+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * base_module_publish
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:34+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 13:08+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 17:15+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:24+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 17:20+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * base_vat
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:34+0000\n"
|
||||
"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * board_account
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * board_association
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"PO-Revision-Date: 2008-09-10 15:05:35+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * board_auction
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 08:03+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-10-28 11:31:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-28 11:31:29+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Translation of OpenERP Server.
|
||||
# Translation of OpenERP Server.
|
||||
# This file containt the translation of the following modules:
|
||||
# * board_project
|
||||
#
|
||||
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 08:15+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 08:53+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 10:18+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -125,7 +125,8 @@
|
|||
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<separator string="Notes" position="before">
|
||||
<field name="carrier_id" context="{'order_id':active_id}"/>
|
||||
<field name="id" invisible="True"/>
|
||||
<field name="carrier_id" context="{'order_id':id}"/>
|
||||
</separator>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -136,7 +137,7 @@
|
|||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_out_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="address_id" position="after">
|
||||
<field name="address_id" position="after">
|
||||
<field name="carrier_id"/>
|
||||
<field name="weight"/>
|
||||
</field>
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -30,6 +30,7 @@ class sale_order(osv.osv):
|
|||
_description = "Sale Order"
|
||||
|
||||
_columns = {
|
||||
'id': fields.integer('ID', readonly=True,invisible=True),
|
||||
'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."),
|
||||
}
|
||||
|
||||
|
|
|
@ -95,8 +95,7 @@ class node_class(object):
|
|||
where.append( ('parent_id','=',self.object.id) )
|
||||
where.append( ('res_id','=',False) )
|
||||
if nodename:
|
||||
where.append( (fobj._rec_name,'=',nodename) )
|
||||
print where+[ ('parent_id','=',self.object and self.object.id or False) ]
|
||||
where.append( (fobj._rec_name,'=',nodename) )
|
||||
ids = fobj.search(self.cr, self.uid, where+[ ('parent_id','=',self.object and self.object.id or False) ], context=self.context)
|
||||
if self.object and self.root and (self.object.type=='ressource'):
|
||||
ids += fobj.search(self.cr, self.uid, where+[ ('parent_id','=',False) ], context=self.context)
|
||||
|
@ -248,27 +247,7 @@ class document_directory(osv.osv):
|
|||
path.append(self.pool.get(directory.ressource_type_id.model).browse(cr,uid,res_id).name)
|
||||
user=self.pool.get('res.users').browse(cr,uid,uid)
|
||||
return "ftp://%s:%s@localhost:8021/%s/%s"%(user.login,user.password,cr.dbname,'/'.join(path))
|
||||
return False
|
||||
def _check_duplication(self, cr, uid,vals):
|
||||
if 'name' in vals:
|
||||
where=" name='%s'"% (vals['name'])
|
||||
if not 'parent_id' in vals or not vals['parent_id']:
|
||||
where+=' and parent_id is null'
|
||||
else:
|
||||
where+=' and parent_id=%d'%(vals['parent_id'])
|
||||
if not 'ressource_parent_type_id' in vals or not vals['ressource_parent_type_id']:
|
||||
where+= ' and ressource_parent_type_id is null'
|
||||
else:
|
||||
where+=" and ressource_parent_type_id='%s'"%(vals['ressource_parent_type_id'])
|
||||
# if not 'ressource_id' in vals or not vals['ressource_id']:
|
||||
# where+= ' and ressource_id is null'
|
||||
# else:
|
||||
# where+=" and ressource_id=%d"%(vals['ressource_id'])
|
||||
cr.execute("select id from document_directory where" + where)
|
||||
res = cr.fetchall()
|
||||
if len(res):
|
||||
return False
|
||||
return True
|
||||
return False
|
||||
def _check_recursion(self, cr, uid, ids):
|
||||
level = 100
|
||||
while len(ids):
|
||||
|
@ -344,13 +323,7 @@ class document_directory(osv.osv):
|
|||
result = map(lambda node: node.path_get(), children)
|
||||
#childs,object2 = self._get_childs(cr, uid, object, False, context)
|
||||
#result = map(lambda x: urlparse.urljoin(path+'/',x.name), childs)
|
||||
return result
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
# need to make constraints to checking duplicate
|
||||
#if not self._check_duplication(cr,uid,vals):
|
||||
# raise except_orm('ValidateError', 'Directory name must be unique!')
|
||||
return super(document_directory,self).write(cr,uid,ids,vals,context=context)
|
||||
return result
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if not default:
|
||||
|
@ -359,9 +332,37 @@ class document_directory(osv.osv):
|
|||
default.update({'name': name+ " (copy)"})
|
||||
return super(document_directory,self).copy(cr,uid,id,default,context)
|
||||
|
||||
def _check_duplication(self, cr, uid,vals,ids=[],op='create'):
|
||||
name=vals.get('name',False)
|
||||
parent_id=vals.get('parent_id',False)
|
||||
ressource_parent_type_id=vals.get('ressource_parent_type_id',False)
|
||||
ressource_id=vals.get('ressource_id',0)
|
||||
if op=='write':
|
||||
for directory in self.browse(cr,uid,ids):
|
||||
if not name:
|
||||
name=directory.name
|
||||
if not parent_id:
|
||||
parent_id=directory.parent_id and directory.parent_id.id or False
|
||||
if not ressource_parent_type_id:
|
||||
ressource_parent_type_id=directory.ressource_parent_type_id and directory.ressource_parent_type_id.id or False
|
||||
if not ressource_id:
|
||||
ressource_id=directory.ressource_id and directory.ressource_id.id or 0
|
||||
res=self.search(cr,uid,[('id','<>',directory.id),('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
|
||||
if len(res):
|
||||
return False
|
||||
if op=='create':
|
||||
res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
|
||||
if len(res):
|
||||
return False
|
||||
return True
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if not self._check_duplication(cr,uid,vals,ids,op='write'):
|
||||
raise except_orm('ValidateError', 'Directory name must be unique!')
|
||||
return super(document_directory,self).write(cr,uid,ids,vals,context=context)
|
||||
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
if not self._check_duplication(cr,uid,vals):
|
||||
raise except_orm('ValidateError', 'Directory name must be unique!')
|
||||
raise except_orm('ValidateError', 'Directory name must be unique!')
|
||||
if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) :
|
||||
raise 'Error'
|
||||
return super(document_directory,self).create(cr, uid, vals, context)
|
||||
|
@ -548,18 +549,39 @@ class document_file(osv.osv):
|
|||
}
|
||||
_sql_constraints = [
|
||||
('filename_uniq', 'unique (name,parent_id,res_id,res_model)', 'The file name must be unique !')
|
||||
]
|
||||
|
||||
def _check_duplication(self, cr, uid,vals):
|
||||
if 'name' in vals:
|
||||
res=self.search(cr,uid,[('name','=',vals['name']),('parent_id','=','parent_id' in vals and vals['parent_id'] or False),('res_id','=','res_id' in vals and vals['res_id'] or False),('res_model','=','res_model' in vals and vals['res_model']) or False])
|
||||
]
|
||||
def _check_duplication(self, cr, uid,vals,ids=[],op='create'):
|
||||
name=vals.get('name',False)
|
||||
parent_id=vals.get('parent_id',False)
|
||||
res_model=vals.get('res_model',False)
|
||||
res_id=vals.get('res_id',0)
|
||||
if op=='write':
|
||||
for file in self.browse(cr,uid,ids):
|
||||
if not name:
|
||||
name=file.name
|
||||
if not parent_id:
|
||||
parent_id=file.parent_id and file.parent_id.id or False
|
||||
if not res_model:
|
||||
res_model=file.res_model and file.res_model or False
|
||||
if not res_id:
|
||||
res_id=file.res_id and file.res_id or 0
|
||||
res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id)])
|
||||
if len(res):
|
||||
return False
|
||||
if op=='create':
|
||||
res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model)])
|
||||
if len(res):
|
||||
return False
|
||||
return True
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if not self._check_duplication(cr,uid,vals):
|
||||
raise except_orm('ValidateError', 'File name must be unique!')
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if not default:
|
||||
default ={}
|
||||
name = self.read(cr, uid, [id])[0]['name']
|
||||
default.update({'name': name+ " (copy)"})
|
||||
return super(document_file,self).copy(cr,uid,id,default,context)
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if not self._check_duplication(cr,uid,vals,ids,'write'):
|
||||
raise except_orm('ValidateError', 'File name must be unique!')
|
||||
result = super(document_file,self).write(cr,uid,ids,vals,context=context)
|
||||
cr.commit()
|
||||
try:
|
||||
|
@ -575,8 +597,12 @@ class document_file(osv.osv):
|
|||
pass
|
||||
return result
|
||||
|
||||
def create(self, cr, uid, vals, context={}):
|
||||
def create(self, cr, uid, vals, context={}):
|
||||
vals['title']=vals['name']
|
||||
if not vals.get('res_id', False) and context.get('default_res_id',False):
|
||||
vals['res_id']=context.get('default_res_id',False)
|
||||
if not vals.get('res_model', False) and context.get('default_res_model',False):
|
||||
vals['res_model']=context.get('default_res_model',False)
|
||||
if vals.get('res_id', False) and vals.get('res_model',False):
|
||||
obj_model=self.pool.get(vals['res_model'])
|
||||
result = obj_model.read(cr, uid, [vals['res_id']], context=context)
|
||||
|
@ -585,18 +611,22 @@ class document_file(osv.osv):
|
|||
vals['title'] = (obj['name'] or '')[:60]
|
||||
if obj_model._name=='res.partner':
|
||||
vals['partner_id']=obj['id']
|
||||
elif 'address_id' in obj:
|
||||
address=self.pool.get('res.partner.address').read(cr,uid,[obj['address_id']],context=context)
|
||||
elif obj.get('address_id',False):
|
||||
if isinstance(obj['address_id'],tuple) or isinstance(obj['address_id'],list):
|
||||
address_id=obj['address_id'][0]
|
||||
else:
|
||||
address_id=obj['address_id']
|
||||
address=self.pool.get('res.partner.address').read(cr,uid,[address_id],context=context)
|
||||
if len(address):
|
||||
vals['partner_id']=address[0]['partner_id'] or False
|
||||
elif 'partner_id' in obj:
|
||||
vals['partner_id']=address[0]['partner_id'][0] or False
|
||||
elif obj.get('partner_id',False):
|
||||
if isinstance(obj['partner_id'],tuple) or isinstance(obj['partner_id'],list):
|
||||
vals['partner_id']=obj['partner_id'][0]
|
||||
else:
|
||||
vals['partner_id']=obj['partner_id']
|
||||
|
||||
datas=None
|
||||
if 'datas' not in vals:
|
||||
if vals.get('datas',False) and vals.get('link',False) :
|
||||
import urllib
|
||||
datas=base64.encodestring(urllib.urlopen(vals['link']).read())
|
||||
else:
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-10-28 10:07:49+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 17:56+0100\n"
|
||||
"Last-Translator: Christophe Chauvet <christophe.chauvet@syleam.fr>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
|
@ -237,7 +237,8 @@ class event_registration(osv.osv):
|
|||
_defaults = {
|
||||
'nb_register': lambda *a: 1,
|
||||
'tobe_invoiced' : lambda *a: True,
|
||||
'name': lambda *a: 'Registration'
|
||||
'name': lambda *a: 'Registration',
|
||||
'state': lambda *b: 'draft'
|
||||
}
|
||||
|
||||
def onchange_badge_name(self, cr, uid, ids, badge_name):
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:31+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 11:02+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 07:06+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-10-28 09:40:44+0000\n"
|
||||
"PO-Revision-Date: 2008-10-28 09:40:44+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 11:14+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 11:30+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -35,8 +35,7 @@
|
|||
|
||||
<record model="ir.ui.view" id="view_holiday">
|
||||
<field name="name">hr.holidays.tree</field>
|
||||
<field name="model">hr.holidays</field>
|
||||
<field name="inherit_id" eval="False"/>
|
||||
<field name="model">hr.holidays</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Employee holidays">
|
||||
|
@ -54,8 +53,7 @@
|
|||
<!-- holidays status -->
|
||||
<record model="ir.ui.view" id="edit_holiday_status_form">
|
||||
<field name="name">hr.holidays.status.form</field>
|
||||
<field name="model">hr.holidays.status</field>
|
||||
<field name="inherit_id" eval="False"/>
|
||||
<field name="model">hr.holidays.status</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Define holiday status">
|
||||
|
@ -69,8 +67,7 @@
|
|||
</record>
|
||||
<record model="ir.ui.view" id="view_holiday_status_tree">
|
||||
<field name="name">hr.holidays.status.tree</field>
|
||||
<field name="model">hr.holidays.status</field>
|
||||
<field name="inherit_id" eval="False"/>
|
||||
<field name="model">hr.holidays.status</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Holiday status">
|
||||
|
@ -145,7 +142,7 @@
|
|||
<record model="ir.actions.act_window" id="open_ask_holidays">
|
||||
<field name="res_model">hr.holidays</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="edit_holiday_inherit_new" />
|
||||
<field name="view_id" ref="edit_holiday_new" />
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 11:55+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 15:49+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:22+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 12:01+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:09+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 12:02+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 12:10+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:48+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:24+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 12:11+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:31+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 13:30+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:45+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 13:30+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name"
|
||||
0,,,,0,1,"indicator","BILAN","Bilan"
|
||||
"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif"
|
||||
"balance(][2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées"
|
||||
"balance(['2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées"
|
||||
"balance(['3']",,"Actif",2,0,1,"indicator","BSTOCK","Stocks"
|
||||
"balance(['4'])",,"Actif",3,0,1,"indicator","BREAL","Réalisable"
|
||||
"balance(['5'])",,"Actif",4,0,1,"fiscal","BDISPO","Disponible"
|
||||
|
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:32+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 12:39+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 13:44+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:32+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 14:37+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:21+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 14:51+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:29+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 15:24+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:01+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:19+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 15:06+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 10:24+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-11 15:41:42+0000\n"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:42+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-11 15:41:42+0000\n"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:42+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:35+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:54+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:34+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:52+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:26+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:52+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-10-28 08:12:59+0000\n"
|
||||
"PO-Revision-Date: 2008-10-28 08:12:59+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 07:01+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:19+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 06:39+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:23+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 06:26+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:24+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 07:04+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
@ -901,8 +901,8 @@ msgstr "Uniquement les Commandes de Livraison"
|
|||
#. module: sale
|
||||
#, python-format
|
||||
#: code:addons/sale/wizard/make_invoice_advance.py:0
|
||||
msgid "You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'."
|
||||
msgstr "Vous ne pouvez pas faire une avance sur une commande client définie comme \'Facture automatique après livraison\'."
|
||||
msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
|
||||
msgstr "Vous ne pouvez pas faire une avance sur une commande client définie comme 'Facture automatique après livraison'."
|
||||
|
||||
#. module: sale
|
||||
#: rml:sale.order:0
|
||||
|
|
|
@ -113,16 +113,16 @@
|
|||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="terp_default_9">[[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]]</para>
|
||||
<para style="terp_default_9">[[ not(o.origin) and 'Error, no sale order attached to this picking !' or '' ]]</para>
|
||||
<blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Bold_9">Invoiced to</para>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']]</para>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]</para>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]</para>
|
||||
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
|
||||
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.street or '']]</para>
|
||||
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.zip or '']]</para>
|
||||
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.city or '' ]]</para>
|
||||
<para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.country_id and o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]</para>
|
||||
|
@ -159,7 +159,7 @@
|
|||
<blockTable colWidths="126.0,103.0,103.0,103.0,103.0" style="Table2">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="terp_default_Centre_8">[[ o.sale_id and o.sale_id.name ]]</para>
|
||||
<para style="terp_default_Centre_8">[[ o.origin ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Centre_8">[[ o.sale_id and o.sale_id.date_order or '']]</para>
|
||||
|
|
|
@ -735,6 +735,7 @@ class sale_order_line(osv.osv):
|
|||
a = self.pool.get('account.fiscal.position').map_account(cr, uid, line.order_id.partner_id, a)
|
||||
inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
|
||||
'name': line.name,
|
||||
'origin':line.order_id.name,
|
||||
'account_id': a,
|
||||
'price_unit': pu,
|
||||
'quantity': uosqty,
|
||||
|
|
|
@ -60,7 +60,7 @@ def _createInvoices(self, cr, uid, data, context={}):
|
|||
if sale.order_policy == 'postpaid':
|
||||
raise osv.except_osv(
|
||||
_('Error'),
|
||||
_('You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'.'))
|
||||
_("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
|
||||
val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id)
|
||||
line_id =obj_lines.create(cr, uid, {
|
||||
'name': val['value']['name'],
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:22+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:33+0000\n"
|
||||
"PO-Revision-Date: 2008-10-11 08:42+0000\n"
|
||||
"Last-Translator: Christophe Chauvet <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 16:04+0000\n"
|
||||
"PO-Revision-Date: 2008-10-13 16:29+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
|
||||
"PO-Revision-Date: 2008-10-14 07:18+0000\n"
|
||||
"Last-Translator: Olivier Laurent <Unknown>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language-Team: OpenERP Language Team <support@openerp.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue