[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121015053217-06u3fa6yyybpartw
This commit is contained in:
commit
ad24f7026b
File diff suppressed because it is too large
Load Diff
|
@ -163,7 +163,7 @@
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
||||||
|
@ -187,7 +187,7 @@
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
|
||||||
|
@ -211,7 +211,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
|
||||||
|
|
|
@ -224,7 +224,7 @@
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -245,7 +245,7 @@
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -266,7 +266,7 @@
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -290,7 +290,7 @@
|
||||||
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
|
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
|
||||||
|
@ -188,7 +188,7 @@
|
||||||
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
|
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
|
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
|
||||||
|
@ -212,7 +212,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
|
||||||
|
|
|
@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory):
|
||||||
if context is None:
|
if context is None:
|
||||||
context = {}
|
context = {}
|
||||||
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
|
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
|
||||||
|
if not context.has_key('active_ids'):
|
||||||
|
journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
|
||||||
|
else:
|
||||||
|
journal_ids = context.get('active_ids')
|
||||||
if 'analytic_account_journal_id' in fields:
|
if 'analytic_account_journal_id' in fields:
|
||||||
res.update({'analytic_account_journal_id': context.get('active_ids',[])})
|
res.update({'analytic_account_journal_id': journal_ids})
|
||||||
return res
|
return res
|
||||||
|
|
||||||
account_analytic_journal_report()
|
account_analytic_journal_report()
|
||||||
|
|
|
@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse):
|
||||||
super(Overdue, self).__init__(cr, uid, name, context=context)
|
super(Overdue, self).__init__(cr, uid, name, context=context)
|
||||||
self.localcontext.update( {
|
self.localcontext.update( {
|
||||||
'time': time,
|
'time': time,
|
||||||
'adr_get': self._adr_get,
|
|
||||||
'getLines': self._lines_get,
|
'getLines': self._lines_get,
|
||||||
'tel_get': self._tel_get,
|
'tel_get': self._tel_get,
|
||||||
'message': self._message,
|
'message': self._message,
|
||||||
})
|
})
|
||||||
self.context = context
|
self.context = context
|
||||||
def _adr_get(self, partner, type):
|
|
||||||
res = []
|
|
||||||
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
|
|
||||||
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
|
|
||||||
adr_id = addresses and addresses[type] or False
|
|
||||||
result = {
|
|
||||||
'name': False,
|
|
||||||
'street': False,
|
|
||||||
'street2': False,
|
|
||||||
'city': False,
|
|
||||||
'zip': False,
|
|
||||||
'state_id':False,
|
|
||||||
'country_id': False,
|
|
||||||
}
|
|
||||||
if adr_id:
|
|
||||||
result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
|
|
||||||
result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
|
|
||||||
result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
|
|
||||||
return result
|
|
||||||
|
|
||||||
res.append(result)
|
|
||||||
return res
|
|
||||||
|
|
||||||
def _tel_get(self,partner):
|
def _tel_get(self,partner):
|
||||||
if not partner:
|
if not partner:
|
||||||
|
|
|
@ -126,15 +126,10 @@
|
||||||
<blockTable colWidths="286.0,224.0" style="Tableau2">
|
<blockTable colWidths="286.0,224.0" style="Tableau2">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
|
<para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
|
||||||
<para style="terp_default_9">[[ addr['street'] ]]</para>
|
<para style="terp_default_9">[[ display_address(o.partner_id)] ]]</para>
|
||||||
<para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
|
|
||||||
<para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
|
|
||||||
<para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
|
|
||||||
<para style="terp_default_9">[[ addr['country_id'] ]]</para>
|
|
||||||
<para style="terp_default_9">
|
<para style="terp_default_9">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
|
@ -216,7 +211,7 @@
|
||||||
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
|
<para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
|
<para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
|
||||||
|
@ -241,7 +236,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
|
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9">
|
<para style="terp_default_9">
|
||||||
|
@ -261,7 +256,7 @@
|
||||||
<para style="terp_default_Bold_9">Balance :</para>
|
<para style="terp_default_Bold_9">Balance :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_8">
|
<para style="terp_default_8">
|
||||||
|
|
|
@ -7,14 +7,14 @@ msgstr ""
|
||||||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||||
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
|
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
|
||||||
"PO-Revision-Date: 2012-02-08 08:45+0000\n"
|
"PO-Revision-Date: 2012-10-12 23:19+0000\n"
|
||||||
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
|
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
|
||||||
"X-Generator: Launchpad (build 15864)\n"
|
"X-Generator: Launchpad (build 16137)\n"
|
||||||
|
|
||||||
#. module: account_analytic_plans
|
#. module: account_analytic_plans
|
||||||
#: view:analytic.plan.create.model:0
|
#: view:analytic.plan.create.model:0
|
||||||
|
@ -471,7 +471,7 @@ msgstr "Analyt. Verrechnungsvorlage"
|
||||||
#. module: account_analytic_plans
|
#. module: account_analytic_plans
|
||||||
#: field:account.analytic.plan.instance,code:0
|
#: field:account.analytic.plan.instance,code:0
|
||||||
msgid "Distribution Code"
|
msgid "Distribution Code"
|
||||||
msgstr "Kurzbezeichnung"
|
msgstr "Verteilungs-Schlüssel"
|
||||||
|
|
||||||
#. module: account_analytic_plans
|
#. module: account_analytic_plans
|
||||||
#: report:account.analytic.account.crossovered.analytic:0
|
#: report:account.analytic.account.crossovered.analytic:0
|
||||||
|
@ -526,6 +526,8 @@ msgid ""
|
||||||
"analytic accounts for each plan set. Then, you must attach a plan set to "
|
"analytic accounts for each plan set. Then, you must attach a plan set to "
|
||||||
"your account journals."
|
"your account journals."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Für jede Kostenrechnung muss ein Stammkonto definiert werden. Dann muss ein "
|
||||||
|
"Plan definiert werden"
|
||||||
|
|
||||||
#. module: account_analytic_plans
|
#. module: account_analytic_plans
|
||||||
#: constraint:account.move.line:0
|
#: constraint:account.move.line:0
|
||||||
|
|
|
@ -1,13 +1,8 @@
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
<!-- budget form and tree view from account module *********************************** -->
|
|
||||||
<record id="action_account_budget_post_tree" model="ir.actions.act_window">
|
<menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
|
||||||
<field name="name">Budgets</field>
|
|
||||||
<field name="res_model">account.budget.post</field>
|
|
||||||
<field name="view_type">tree</field>
|
|
||||||
</record>
|
|
||||||
<menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Budgets
|
Budgets
|
||||||
|
|
|
@ -32,7 +32,6 @@ class report_print_check(report_sxw.rml_parse):
|
||||||
'time': time,
|
'time': time,
|
||||||
'get_lines': self.get_lines,
|
'get_lines': self.get_lines,
|
||||||
'fill_stars' : self.fill_stars,
|
'fill_stars' : self.fill_stars,
|
||||||
'get_zip_line': self.get_zip_line,
|
|
||||||
})
|
})
|
||||||
def fill_stars(self, amount):
|
def fill_stars(self, amount):
|
||||||
amount = amount.replace('Dollars','')
|
amount = amount.replace('Dollars','')
|
||||||
|
@ -41,25 +40,6 @@ class report_print_check(report_sxw.rml_parse):
|
||||||
return ' '.join([amount,'*'*stars])
|
return ' '.join([amount,'*'*stars])
|
||||||
|
|
||||||
else: return amount
|
else: return amount
|
||||||
|
|
||||||
def get_zip_line(self, address):
|
|
||||||
'''
|
|
||||||
Get the address line
|
|
||||||
'''
|
|
||||||
ret = ''
|
|
||||||
if address:
|
|
||||||
if address.city:
|
|
||||||
ret += address.city
|
|
||||||
if address.state_id:
|
|
||||||
if address.state_id.name:
|
|
||||||
if ret:
|
|
||||||
ret += ', '
|
|
||||||
ret += address.state_id.name
|
|
||||||
if address.zip:
|
|
||||||
if ret:
|
|
||||||
ret += ' '
|
|
||||||
ret += address.zip
|
|
||||||
return ret
|
|
||||||
|
|
||||||
def get_lines(self, voucher_lines):
|
def get_lines(self, voucher_lines):
|
||||||
result = []
|
result = []
|
||||||
|
|
|
@ -281,10 +281,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
|
||||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
|
||||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -237,10 +237,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
<para style="P15">[[ voucher.partner_id.name ]]</para>
|
||||||
<para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
|
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
|
||||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
|
||||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -153,9 +153,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P9">[[ voucher.partner_id.name ]] </para>
|
<para style="P9">[[ voucher.partner_id.name ]] </para>
|
||||||
<para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
|
<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
|
||||||
<para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
|
|
||||||
<para style="P15">[[ voucher.partner_id.country_id.name]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para/>
|
<para/>
|
||||||
|
|
|
@ -30,7 +30,6 @@ class report_rappel(report_sxw.rml_parse):
|
||||||
self.localcontext.update({
|
self.localcontext.update({
|
||||||
'time': time,
|
'time': time,
|
||||||
'ids_to_objects': self._ids_to_objects,
|
'ids_to_objects': self._ids_to_objects,
|
||||||
'adr_get': self._adr_get,
|
|
||||||
'getLines': self._lines_get,
|
'getLines': self._lines_get,
|
||||||
'get_text': self._get_text
|
'get_text': self._get_text
|
||||||
})
|
})
|
||||||
|
@ -43,11 +42,6 @@ class report_rappel(report_sxw.rml_parse):
|
||||||
all_lines.append(line)
|
all_lines.append(line)
|
||||||
return all_lines
|
return all_lines
|
||||||
|
|
||||||
def _adr_get(self, stat_line, type):
|
|
||||||
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
|
|
||||||
adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
|
|
||||||
return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
|
|
||||||
|
|
||||||
def _lines_get(self, stat_by_partner_line):
|
def _lines_get(self, stat_by_partner_line):
|
||||||
pool = pooler.get_pool(self.cr.dbname)
|
pool = pooler.get_pool(self.cr.dbname)
|
||||||
moveline_obj = pool.get('account.move.line')
|
moveline_obj = pool.get('account.move.line')
|
||||||
|
|
|
@ -129,15 +129,10 @@
|
||||||
<blockTable colWidths="298.0,234.0" style="Tableau2">
|
<blockTable colWidths="298.0,234.0" style="Tableau2">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9">[[ o.partner_id.name or '' ]]</para>
|
<para style="terp_default_9">[[ o.partner_id.name or '' ]]</para>
|
||||||
<para style="terp_default_9">[[ a['street'] or '']]</para>
|
<para style="terp_default_9">[[ display_address(o.partner_id) or '']]</para>
|
||||||
<para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
|
|
||||||
<para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
|
|
||||||
<para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
|
|
||||||
<para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
|
|
||||||
<para style="terp_default_9">
|
<para style="terp_default_9">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -256,10 +256,10 @@
|
||||||
<para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
|
<para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
|
<para style="terp_default_Right_9">[[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj= line.currency)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -275,10 +275,10 @@
|
||||||
<para style="terp_default_Bold_9">Total:</para>
|
<para style="terp_default_Bold_9">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse):
|
||||||
'time': time,
|
'time': time,
|
||||||
'get_invoice_name': self._get_invoice_name,
|
'get_invoice_name': self._get_invoice_name,
|
||||||
'get_company_currency': self._get_company_currency,
|
'get_company_currency': self._get_company_currency,
|
||||||
'get_company_currency_symbol': self._get_company_currency_symbol,
|
|
||||||
'get_amount_total_in_currency': self._get_amount_total_in_currency,
|
'get_amount_total_in_currency': self._get_amount_total_in_currency,
|
||||||
'get_amount_total': self._get_amount_total,
|
'get_amount_total': self._get_amount_total,
|
||||||
'get_account_name': self._get_account_name,
|
'get_account_name': self._get_account_name,
|
||||||
|
@ -72,12 +71,8 @@ class payment_order(report_sxw.rml_parse):
|
||||||
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
|
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
|
||||||
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
|
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
|
||||||
|
|
||||||
def _get_company_currency_symbol(self):
|
|
||||||
pool = pooler.get_pool(self.cr.dbname)
|
|
||||||
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
|
|
||||||
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
|
|
||||||
|
|
||||||
def _get_account_name(self, bank_id):
|
def _get_account_name(self,bank_id):
|
||||||
if bank_id:
|
if bank_id:
|
||||||
pool = pooler.get_pool(self.cr.dbname)
|
pool = pooler.get_pool(self.cr.dbname)
|
||||||
value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
|
value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
|
||||||
|
|
|
@ -219,7 +219,7 @@
|
||||||
<para style="terp_default_9_30cm">[[ p['pname'] ]]</para>
|
<para style="terp_default_9_30cm">[[ p['pname'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ p['amount'] ]] [[ voucher.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -323,7 +323,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ voucher.amount ]] [[ voucher.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -416,7 +416,7 @@ openerp.base_import = function (instance) {
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('')
|
].join('')
|
||||||
},
|
},
|
||||||
})).get(0).scrollIntoView();
|
}));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
// FSM-ize DataImport
|
// FSM-ize DataImport
|
||||||
|
|
|
@ -777,7 +777,6 @@ class crm_lead(base_stage, format_address, osv.osv):
|
||||||
'default_user_id': uid,
|
'default_user_id': uid,
|
||||||
'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
|
'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
|
||||||
'default_email_from': opportunity.email_from,
|
'default_email_from': opportunity.email_from,
|
||||||
'default_state': 'open',
|
|
||||||
'default_name': opportunity.name,
|
'default_name': opportunity.name,
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
|
|
|
@ -105,7 +105,23 @@
|
||||||
<field name="allow_unlink"/>
|
<field name="allow_unlink"/>
|
||||||
</group>
|
</group>
|
||||||
<separator string="Team Members"/>
|
<separator string="Team Members"/>
|
||||||
<field name="member_ids"/>
|
<field name="member_ids" widget="many2many_kanban">
|
||||||
|
<kanban quick_create="false" create="true">
|
||||||
|
<field name="name"/>
|
||||||
|
<templates>
|
||||||
|
<t t-name="kanban-box">
|
||||||
|
<div style="position: relative">
|
||||||
|
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
|
||||||
|
<div class="oe_module_vignette">
|
||||||
|
<div class="oe_module_desc">
|
||||||
|
<field name="name"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</t>
|
||||||
|
</templates>
|
||||||
|
</kanban>
|
||||||
|
</field>
|
||||||
</page>
|
</page>
|
||||||
<page string="Stages">
|
<page string="Stages">
|
||||||
<separator string="Select Stages for this Sales Team"/>
|
<separator string="Select Stages for this Sales Team"/>
|
||||||
|
|
|
@ -116,30 +116,28 @@
|
||||||
<label for="name" class="oe_edit_only"/>
|
<label for="name" class="oe_edit_only"/>
|
||||||
<h1><field name="name"/></h1>
|
<h1><field name="name"/></h1>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<label for="address_id" string="Location"/>
|
||||||
<label for="address_id" string="Location"/>
|
<div>
|
||||||
<div>
|
<field name="address_id" on_change="on_change_address_id(address_id)" />
|
||||||
<field name="address_id" on_change="on_change_address_id(address_id)" />
|
<field name="street" placeholder="Street..."/>
|
||||||
<field name="street" placeholder="Street..."/>
|
<field name="street2"/>
|
||||||
<field name="street2"/>
|
<div class="address_format">
|
||||||
<div class="address_format">
|
<field name="city" placeholder="City" style="width: 40%%"/>
|
||||||
<field name="city" placeholder="City" style="width: 40%%"/>
|
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
|
||||||
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
|
<field name="zip" placeholder="ZIP" style="width: 20%%"/>
|
||||||
<field name="zip" placeholder="ZIP" style="width: 20%%"/>
|
</div>
|
||||||
</div>
|
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
|
||||||
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
|
</div>
|
||||||
</div>
|
|
||||||
</group>
|
|
||||||
<group>
|
|
||||||
<field name="type" on_change="onchange_event_type(type,context)"/>
|
|
||||||
<field name="date_begin"/>
|
|
||||||
<field name="date_end"/>
|
|
||||||
<field name="company_id" groups="base.group_multi_company"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
</group>
|
||||||
</div>
|
<group>
|
||||||
|
<field name="type" on_change="onchange_event_type(type,context)" />
|
||||||
|
<field name="date_begin"/>
|
||||||
|
<field name="date_end"/>
|
||||||
|
<field name="company_id" groups="base.group_multi_company"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="Email Configuration" groups="base.group_no_one">
|
<page string="Email Configuration" groups="base.group_no_one">
|
||||||
<group>
|
<group>
|
||||||
|
@ -284,13 +282,13 @@
|
||||||
<t t-if="record.register_avail.raw_value != 0">
|
<t t-if="record.register_avail.raw_value != 0">
|
||||||
<t t-if="!record.is_subscribed.raw_value">
|
<t t-if="!record.is_subscribed.raw_value">
|
||||||
<input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
|
<input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
|
||||||
<button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
|
<button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
|
||||||
<span >Subscribe</span>
|
<span >Subscribe</span>
|
||||||
</button>
|
</button>
|
||||||
</t>
|
</t>
|
||||||
</t>
|
</t>
|
||||||
<t t-if="record.is_subscribed.raw_value">
|
<t t-if="record.is_subscribed.raw_value">
|
||||||
<button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
|
<button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
|
||||||
<span>Subscribed</span>
|
<span>Subscribed</span>
|
||||||
<span class="unsubscribe">Unsubscribe</span>
|
<span class="unsubscribe">Unsubscribe</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -42,4 +42,10 @@
|
||||||
width:256px;
|
width:256px;
|
||||||
border: 1px solid #eeeeee;
|
border: 1px solid #eeeeee;
|
||||||
}
|
}
|
||||||
|
.oe_unsubscribe, .oe_unsubscribe_button:hover span {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.oe_unsubscribe_button:hover .oe_unsubscribe {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -231,7 +231,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -277,7 +277,7 @@
|
||||||
<para style="terp_tblheader_Details">Total:</para>
|
<para style="terp_tblheader_Details">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -206,7 +206,7 @@
|
||||||
<para style="P2">[[ formatLang(r['amount']) ]]</para>
|
<para style="P2">[[ formatLang(r['amount']) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
<para style="P3">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -222,7 +222,7 @@
|
||||||
<para style="P15">Total:</para>
|
<para style="P15">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
<para style="P11">[[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -197,7 +197,8 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
<para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
|
||||||
|
[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -293,7 +294,7 @@
|
||||||
<para style="P4">[[ formatLang(p.amount) ]]</para>
|
<para style="P4">[[ formatLang(p.amount) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
|
<para style="P5">[[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -234,7 +234,8 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
|
||||||
|
[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -334,7 +335,7 @@
|
||||||
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
<para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -391,7 +392,7 @@
|
||||||
<para style="P5">[[ formatLang(r['amount']) ]]</para>
|
<para style="P5">[[ formatLang(r['amount']) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
|
<para style="P6">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -36,7 +36,7 @@ class hr_payslip(osv.osv):
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
|
'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
|
||||||
'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||||
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
|
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv):
|
||||||
_inherit = 'hr.payslip.run'
|
_inherit = 'hr.payslip.run'
|
||||||
_description = 'Payslip Run'
|
_description = 'Payslip Run'
|
||||||
_columns = {
|
_columns = {
|
||||||
'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
def _get_default_journal(self, cr, uid, context=None):
|
def _get_default_journal(self, cr, uid, context=None):
|
||||||
|
|
|
@ -297,7 +297,6 @@ class hr_applicant(base_stage, osv.Model):
|
||||||
res['context'] = {
|
res['context'] = {
|
||||||
'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
|
'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
|
||||||
'default_user_id': uid,
|
'default_user_id': uid,
|
||||||
'default_state': 'open',
|
|
||||||
'default_name': applicant.name,
|
'default_name': applicant.name,
|
||||||
'default_categ_ids': category and [category.id] or False,
|
'default_categ_ids': category and [category.id] or False,
|
||||||
}
|
}
|
||||||
|
|
|
@ -289,7 +289,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="oe_kanban_content" tooltip="kanban-tooltip">
|
<div class="oe_kanban_content" tooltip="kanban-tooltip">
|
||||||
<div>
|
<div>
|
||||||
<b><field name="name"/></b><br/>
|
<t t-if="record.partner_name.raw_value"><b><field name="partner_name"/></b><br/></t>
|
||||||
|
<i><field name="name"/></i><br/>
|
||||||
<field name="job_id"/><br/>
|
<field name="job_id"/><br/>
|
||||||
<t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
|
<t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
|
||||||
<t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
|
<t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
|
||||||
|
|
|
@ -7,14 +7,14 @@ msgstr ""
|
||||||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||||
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
||||||
"PO-Revision-Date: 2012-05-10 18:04+0000\n"
|
"PO-Revision-Date: 2012-10-12 23:22+0000\n"
|
||||||
"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
|
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
|
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
|
||||||
"X-Generator: Launchpad (build 15864)\n"
|
"X-Generator: Launchpad (build 16137)\n"
|
||||||
|
|
||||||
#. module: hr_timesheet_invoice
|
#. module: hr_timesheet_invoice
|
||||||
#: view:report.timesheet.line:0
|
#: view:report.timesheet.line:0
|
||||||
|
@ -769,7 +769,7 @@ msgstr "Menge"
|
||||||
#. module: hr_timesheet_invoice
|
#. module: hr_timesheet_invoice
|
||||||
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
|
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
|
||||||
msgid "Date/Code"
|
msgid "Date/Code"
|
||||||
msgstr "Datum/Kurzbez."
|
msgstr "Dat/Kurzb."
|
||||||
|
|
||||||
#. module: hr_timesheet_invoice
|
#. module: hr_timesheet_invoice
|
||||||
#: field:report.timesheet.line,general_account_id:0
|
#: field:report.timesheet.line,general_account_id:0
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
<para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
|
<para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -129,7 +129,7 @@
|
||||||
<para style="terp_tblheader_General_Right">Total:</para>
|
<para style="terp_tblheader_General_Right">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -290,9 +290,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
|
<para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
|
||||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
|
<para style="terp_default_Bold_8">[[display_address(o.employee_id.address_home_id) or '_' ]]</para>
|
||||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
|
|
||||||
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -234,7 +234,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13],currency_obj= company.currency_id)]] </para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -248,43 +248,43 @@
|
||||||
<para style="terp_tblheader_Details">Total</para>
|
<para style="terp_tblheader_Details">Total</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_tblheader_General_Right">[[ formatLang(get_total(), currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -478,7 +478,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(e1[13],currency_obj= company.currency_id) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -571,7 +571,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(e2[13],currency_obj= company.currency_id) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -247,7 +247,7 @@
|
||||||
<para style="P5">[[ line['acc_no'] ]]</para>
|
<para style="P5">[[ line['acc_no'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
<para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P5">[[ line['debit_credit'] ]]</para>
|
<para style="P5">[[ line['debit_credit'] ]]</para>
|
||||||
|
@ -296,7 +296,7 @@
|
||||||
<para style="P5">[[ line['ifsc_code'] ]]</para>
|
<para style="P5">[[ line['ifsc_code'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
<para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P5">[[ line['debit_credit'] ]]</para>
|
<para style="P5">[[ line['debit_credit'] ]]</para>
|
||||||
|
@ -321,7 +321,7 @@
|
||||||
<para style="P4"/>
|
<para style="P4"/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P4">
|
<para style="P4">
|
||||||
|
@ -347,7 +347,7 @@
|
||||||
<para style="P4"/>
|
<para style="P4"/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
|
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P4">
|
<para style="P4">
|
||||||
|
|
|
@ -234,7 +234,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
|
<para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -334,7 +334,7 @@
|
||||||
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
<para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
<para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
|
<para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -155,7 +155,7 @@
|
||||||
<para style="terp_default_9">[[ lines.descript]]</para>
|
<para style="terp_default_9">[[ lines.descript]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
|
<para style="terp_default_9_right">[[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
<para style="terp_tbl_detail_header">Total :</para>
|
<para style="terp_tbl_detail_header">Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
|
<para style="terp_default_9_right_bold">[[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -7,14 +7,14 @@ msgstr ""
|
||||||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||||
"POT-Creation-Date: 2012-02-08 00:49+0000\n"
|
"POT-Creation-Date: 2012-02-08 00:49+0000\n"
|
||||||
"PO-Revision-Date: 2012-02-22 07:45+0000\n"
|
"PO-Revision-Date: 2012-10-12 23:20+0000\n"
|
||||||
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
|
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
|
||||||
"X-Generator: Launchpad (build 15944)\n"
|
"X-Generator: Launchpad (build 16137)\n"
|
||||||
|
|
||||||
#. module: mrp
|
#. module: mrp
|
||||||
#: view:mrp.routing.workcenter:0
|
#: view:mrp.routing.workcenter:0
|
||||||
|
@ -956,7 +956,7 @@ msgstr "Bezeichnung Arbeitsplatz"
|
||||||
#. module: mrp
|
#. module: mrp
|
||||||
#: field:mrp.routing,code:0
|
#: field:mrp.routing,code:0
|
||||||
msgid "Code"
|
msgid "Code"
|
||||||
msgstr "Kurzbezeichnung"
|
msgstr "Kurzbez."
|
||||||
|
|
||||||
#. module: mrp
|
#. module: mrp
|
||||||
#: report:mrp.production.order:0
|
#: report:mrp.production.order:0
|
||||||
|
|
|
@ -971,7 +971,7 @@
|
||||||
<attribute name="invisible">False</attribute>
|
<attribute name="invisible">False</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
<group name="procurement_help" position="inside">
|
<group name="procurement_help" position="inside">
|
||||||
<p attrs="{'invisible': [('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}">
|
<p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}">
|
||||||
When you sell this product, OpenERP will trigger <b>a manufacturing
|
When you sell this product, OpenERP will trigger <b>a manufacturing
|
||||||
order</b> using the bill of materials assigned to this product.
|
order</b> using the bill of materials assigned to this product.
|
||||||
The delivery order will be ready once the production is done.
|
The delivery order will be ready once the production is done.
|
||||||
|
@ -1038,6 +1038,7 @@
|
||||||
<record model="ir.actions.act_window" id="product_open_bom">
|
<record model="ir.actions.act_window" id="product_open_bom">
|
||||||
<field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
|
<field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
|
||||||
<field name="name">Bill of Materials</field>
|
<field name="name">Bill of Materials</field>
|
||||||
|
<field name="domain">[('bom_id','=',False)]</field>
|
||||||
<field name="res_model">mrp.bom</field>
|
<field name="res_model">mrp.bom</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
|
@ -312,7 +312,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
|
<para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -337,7 +337,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -353,7 +353,7 @@
|
||||||
<para style="terp_default_9">Net Total :</para>
|
<para style="terp_default_9">Net Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -367,7 +367,7 @@
|
||||||
<para style="terp_default_9">Taxes:</para>
|
<para style="terp_default_9">Taxes:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="P26">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -380,7 +380,7 @@
|
||||||
<para style="terp_tblheader_Details">Total :</para>
|
<para style="terp_tblheader_Details">Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -214,10 +214,10 @@
|
||||||
<para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
|
<para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -250,7 +250,7 @@
|
||||||
<para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
|
<para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -267,7 +267,7 @@
|
||||||
<para style="terp_tblheader_Details">Total :</para>
|
<para style="terp_tblheader_Details">Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -73,7 +73,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
|
||||||
if res:
|
if res:
|
||||||
return res[0]['bal']
|
return res[0]['bal']
|
||||||
else:
|
else:
|
||||||
return False
|
return 0
|
||||||
|
|
||||||
def _get_sub_total(self, user, data, date):
|
def _get_sub_total(self, user, data, date):
|
||||||
res={}
|
res={}
|
||||||
|
|
|
@ -183,10 +183,10 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
|
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
|
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user), currency_obj = company.currency_id)]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -207,10 +207,10 @@
|
||||||
<para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
|
<para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
|
<para style="P1"><u>[[ formatLang(get_bal(statement), currency_obj = company.currency_id)]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
|
<para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -236,7 +236,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -252,7 +252,7 @@
|
||||||
<para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
|
<para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
|
<para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
|
||||||
|
@ -289,7 +289,7 @@
|
||||||
<para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
|
<para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -320,7 +320,7 @@
|
||||||
<para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
|
<para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -349,7 +349,7 @@
|
||||||
<para style="terp_default_Bold_9">Sales total(Revenue)</para>
|
<para style="terp_default_Bold_9">Sales total(Revenue)</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -365,7 +365,7 @@
|
||||||
<para style="terp_default_Bold_9">Total invoiced</para>
|
<para style="terp_default_Bold_9">Total invoiced</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -373,7 +373,7 @@
|
||||||
<para style="terp_default_Bold_9">Total discount</para>
|
<para style="terp_default_Bold_9">Total discount</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -381,7 +381,7 @@
|
||||||
<para style="terp_default_Bold_9">Total paid</para>
|
<para style="terp_default_Bold_9">Total paid</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -389,7 +389,7 @@
|
||||||
<para style="terp_default_Bold_9">Total of the day</para>
|
<para style="terp_default_Bold_9">Total of the day</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -204,7 +204,7 @@
|
||||||
<para style="P1">[[ p[0] ]]</para>
|
<para style="P1">[[ p[0] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(p[1], currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -235,7 +235,7 @@
|
||||||
<para style="P2">[[ t[0] ]]</para>
|
<para style="P2">[[ t[0] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(t[1], currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -280,7 +280,7 @@
|
||||||
<para style="terp_default_Bold_9">Total invoiced</para>
|
<para style="terp_default_Bold_9">Total invoiced</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -288,7 +288,7 @@
|
||||||
<para style="terp_default_Bold_9">Total discount</para>
|
<para style="terp_default_Bold_9">Total discount</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -296,7 +296,7 @@
|
||||||
<para style="terp_default_Bold_9">Total paid</para>
|
<para style="terp_default_Bold_9">Total paid</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -304,7 +304,7 @@
|
||||||
<para style="terp_default_Bold_9">Total of the day</para>
|
<para style="terp_default_Bold_9">Total of the day</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -186,7 +186,7 @@
|
||||||
<para style="terp_default_Centre_9">[[ formatLang(l.discount) ]]</para>
|
<para style="terp_default_Centre_9">[[ formatLang(l.discount) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -202,7 +202,7 @@
|
||||||
<para style="terp_default_9">Net Total :</para>
|
<para style="terp_default_9">Net Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -215,7 +215,7 @@
|
||||||
<para style="terp_default_9">Taxes :</para>
|
<para style="terp_default_9">Taxes :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -228,7 +228,7 @@
|
||||||
<para style="terp_default_Bold_9">Total:</para>
|
<para style="terp_default_Bold_9">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
<para style="terp_tblheader_Details">Net Total:</para>
|
<para style="terp_tblheader_Details">Net Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -168,7 +168,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj = company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -194,7 +194,7 @@
|
||||||
<para style="terp_tblheader_General_Right">Total:</para>
|
<para style="terp_tblheader_General_Right">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -72,8 +72,7 @@
|
||||||
<story>
|
<story>
|
||||||
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
|
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
|
||||||
<para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
|
<para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
|
||||||
<para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
|
<para style="terp_default_Centre_9">[[ address and display_address(address)]]</para>
|
||||||
<para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
|
|
||||||
<para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
|
<para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
|
||||||
<para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
|
<para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
|
||||||
<para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
|
<para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
|
||||||
|
@ -109,7 +108,7 @@
|
||||||
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
|
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] <font face="Helvetica">[[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]</font></para>
|
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] <font face="Helvetica">[[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])</font></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -119,7 +118,7 @@
|
||||||
<para style="P6a">Taxes :</para>
|
<para style="P6a">Taxes :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -129,7 +128,7 @@
|
||||||
<para style="P6">Total :</para>
|
<para style="P6">Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Bold_9_Right2">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]</para>
|
<para style="terp_default_Bold_9_Right2">[[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -158,7 +157,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="P8">[[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]</para>
|
<para style="P8">[[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -191,7 +191,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -208,7 +208,7 @@
|
||||||
<para style="terp_tblheader_General_Right">Total :</para>
|
<para style="terp_tblheader_General_Right">Total :</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement), currency_obj = company.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<field name="inherit_id" ref="base.view_users_form" />
|
<field name="inherit_id" ref="base.view_users_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<notebook position="inside">
|
<notebook position="inside">
|
||||||
<page string="Point Of Sale">
|
<page string="Point of Sale">
|
||||||
<group>
|
<group>
|
||||||
<field name="pos_config" />
|
<field name="pos_config" />
|
||||||
<field name="ean13" />
|
<field name="ean13" />
|
||||||
|
|
|
@ -332,12 +332,12 @@
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//group[@name='general']" position="after" >
|
<xpath expr="//group[@name='general']" position="after" >
|
||||||
<group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
|
<group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
|
||||||
<p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_stock')]}">
|
<p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_stock')]}">
|
||||||
When you sell this service, nothing special will be trigered
|
When you sell this service, nothing special will be triggered
|
||||||
to deliver the customer, as you set the procurement method as
|
to deliver the customer, as you set the procurement method as
|
||||||
'Make to Stock'.
|
'Make to Stock'.
|
||||||
</p>
|
</p>
|
||||||
<p attrs="{'invisible': [('type','<>','product'),('procure_method','<>','make_to_stock')]}">
|
<p attrs="{'invisible': ['|','|',('type','<>','product'),('procure_method','<>','make_to_stock')]}">
|
||||||
When you sell this product, OpenERP will <b>use the available
|
When you sell this product, OpenERP will <b>use the available
|
||||||
inventory</b> for the delivery order.
|
inventory</b> for the delivery order.
|
||||||
<br/><br/>
|
<br/><br/>
|
||||||
|
@ -345,7 +345,7 @@
|
||||||
will wait for new products. To fulfill the inventory, you should
|
will wait for new products. To fulfill the inventory, you should
|
||||||
create others rules like orderpoints.
|
create others rules like orderpoints.
|
||||||
</p>
|
</p>
|
||||||
<p attrs="{'invisible': [('type','<>','consu'),('procure_method','<>','make_to_stock')]}">
|
<p attrs="{'invisible': ['|','|',('type','<>','consu'),('procure_method','<>','make_to_stock')]}">
|
||||||
When you sell this product, a delivery order will be created.
|
When you sell this product, a delivery order will be created.
|
||||||
OpenERP will consider that the <b>required quantities are always
|
OpenERP will consider that the <b>required quantities are always
|
||||||
available</b> as it's a consumable (as a result of this, the quantity
|
available</b> as it's a consumable (as a result of this, the quantity
|
||||||
|
|
|
@ -109,8 +109,8 @@ class product_uom(osv.osv):
|
||||||
|
|
||||||
_order = "name"
|
_order = "name"
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Name', size=64, required=True, translate=True),
|
'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
|
||||||
'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade',
|
'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
|
||||||
help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
|
help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
|
||||||
'factor': fields.float('Ratio', required=True,digits=(12, 12),
|
'factor': fields.float('Ratio', required=True,digits=(12, 12),
|
||||||
help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
|
help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
|
||||||
|
@ -126,7 +126,7 @@ class product_uom(osv.osv):
|
||||||
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
|
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
|
||||||
'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
|
'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
|
||||||
('reference','Reference Unit of Measure for this category'),
|
('reference','Reference Unit of Measure for this category'),
|
||||||
('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1),
|
('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
|
||||||
}
|
}
|
||||||
|
|
||||||
_defaults = {
|
_defaults = {
|
||||||
|
|
|
@ -104,11 +104,11 @@
|
||||||
<field name="cost_method" groups="product.group_costing_method"/>
|
<field name="cost_method" groups="product.group_costing_method"/>
|
||||||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
||||||
</group>
|
</group>
|
||||||
<group name="procurement_uom" groups="product.group_uom">
|
<group name="procurement_uom" groups="product.group_uom" string="Purchase">
|
||||||
<field name="uom_po_id"/>
|
<field name="uom_po_id"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<separator string="Notes for Suppliers"/>
|
<separator string="Description for Suppliers"/>
|
||||||
<field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
|
<field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
|
||||||
</page>
|
</page>
|
||||||
<page string="Inventory" groups="base.group_user">
|
<page string="Inventory" groups="base.group_user">
|
||||||
|
@ -160,7 +160,7 @@
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
<separator string="Notes on Quotations"/>
|
<separator string="Description for Quotations"/>
|
||||||
<field name="description_sale" placeholder="note to be displayed on quotations..."/>
|
<field name="description_sale" placeholder="note to be displayed on quotations..."/>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
|
@ -412,7 +412,6 @@
|
||||||
<tree string="Units of Measure">
|
<tree string="Units of Measure">
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="category_id"/>
|
<field name="category_id"/>
|
||||||
<field name="factor"/>
|
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -426,19 +425,22 @@
|
||||||
<group>
|
<group>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="category_id"/>
|
<field name="category_id"/>
|
||||||
<field name="active"/>
|
<field name="uom_type" on_change="onchange_type(uom_type)"/>
|
||||||
|
<label for="factor"/>
|
||||||
|
<div>
|
||||||
|
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
||||||
|
<field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||||
|
<p attrs="{'invisible':[('uom_type','!=','smaller')]}" class="oe_grey">
|
||||||
|
e.g: 1 * (reference unit) = ratio * (this unit)
|
||||||
|
</p>
|
||||||
|
<p attrs="{'invisible':[('uom_type','!=','bigger')]}" class="oe_grey">
|
||||||
|
e.g: 1 * (this unit) = ratio * (reference unit)
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="uom_type" on_change="onchange_type(uom_type)"/>
|
<field name="active"/>
|
||||||
<p attrs="{'invisible':[('uom_type','!=','smaller')]}" colspan="2">
|
|
||||||
e.g: 1 * (reference unit) = ratio * (this unit)
|
|
||||||
</p>
|
|
||||||
<p attrs="{'invisible':[('uom_type','!=','bigger')]}" colspan="2">
|
|
||||||
e.g: 1 * (this unit) = ratio * (reference unit)
|
|
||||||
</p>
|
|
||||||
<field name="rounding"/>
|
<field name="rounding"/>
|
||||||
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
|
||||||
<field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -1425,7 +1425,7 @@ class project_task_history_cumulative(osv.osv):
|
||||||
}
|
}
|
||||||
|
|
||||||
def init(self, cr):
|
def init(self, cr):
|
||||||
tools.drop_view_if_exists(cr, 'report_event_registration')
|
tools.drop_view_if_exists(cr, 'project_task_history_cumulative')
|
||||||
|
|
||||||
cr.execute(""" CREATE VIEW project_task_history_cumulative AS (
|
cr.execute(""" CREATE VIEW project_task_history_cumulative AS (
|
||||||
SELECT
|
SELECT
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
<attribute name="invisible">False</attribute>
|
<attribute name="invisible">False</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
<group name="procurement_help" position="inside">
|
<group name="procurement_help" position="inside">
|
||||||
<p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}">
|
<p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}">
|
||||||
When you sell this service to a customer, <b>a task</b> will be
|
When you sell this service to a customer, <b>a task</b> will be
|
||||||
created to follow up the job to do. This task will appear
|
created to follow up the job to do. This task will appear
|
||||||
in the project related to the contract of the sale order.
|
in the project related to the contract of the sale order.
|
||||||
|
|
|
@ -608,13 +608,13 @@
|
||||||
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
|
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<group name="procurement_help" position="inside">
|
<group name="procurement_help" position="inside">
|
||||||
<p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}">
|
<p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}">
|
||||||
When you sell this service to a customer, <b>a draft purchase order</b>
|
When you sell this service to a customer, <b>a draft purchase order</b>
|
||||||
will be created in order to subcontract the job
|
will be created in order to subcontract the job
|
||||||
<i attrs="{'invisible': [('seller_id','=',False)]}">to
|
<i attrs="{'invisible': [('seller_id','=',False)]}">to
|
||||||
<field name="seller_id" class="oe_inline"/></i>.
|
<field name="seller_id" class="oe_inline"/></i>.
|
||||||
</p>
|
</p>
|
||||||
<p attrs="{'invisible': [('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}">
|
<p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}">
|
||||||
When you sell this product, OpenERP will trigger <b>a draft
|
When you sell this product, OpenERP will trigger <b>a draft
|
||||||
purchase order</b> to buy the required quantities to the supplier.
|
purchase order</b> to buy the required quantities to the supplier.
|
||||||
The delivery order will be ready after having received the
|
The delivery order will be ready after having received the
|
||||||
|
|
|
@ -245,7 +245,7 @@
|
||||||
<para style="terp_default_Centre_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
|
<para style="terp_default_Centre_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -301,7 +301,7 @@
|
||||||
<para style="terp_default_9">Total (excl. taxes):</para>
|
<para style="terp_default_9">Total (excl. taxes):</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -314,7 +314,7 @@
|
||||||
<para style="terp_default_9">Taxes:</para>
|
<para style="terp_default_9">Taxes:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -327,7 +327,7 @@
|
||||||
<para style="terp_default_Bold_9">Total (inclu. taxes):</para>
|
<para style="terp_default_Bold_9">Total (inclu. taxes):</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total, currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -360,10 +360,10 @@
|
||||||
<para style="terp_default_8">[[ t.name ]]</para>
|
<para style="terp_default_8">[[ t.name ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
|
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_8">
|
<para style="terp_default_8">
|
||||||
|
|
|
@ -122,7 +122,7 @@ class sale_configuration(osv.osv_memory):
|
||||||
class account_config_settings(osv.osv_memory):
|
class account_config_settings(osv.osv_memory):
|
||||||
_inherit = 'account.config.settings'
|
_inherit = 'account.config.settings'
|
||||||
_columns = {
|
_columns = {
|
||||||
'module_sale_analytic_plans': fields.boolean('Several analytic accounts on sales',
|
'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales',
|
||||||
help="""This allows install module sale_analytic_plans."""),
|
help="""This allows install module sale_analytic_plans."""),
|
||||||
'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
|
'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
|
||||||
implied_group='sale.group_analytic_accounting',
|
implied_group='sale.group_analytic_accounting',
|
||||||
|
|
|
@ -194,7 +194,7 @@ class sale_order(osv.osv):
|
||||||
'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
|
'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
|
||||||
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True),
|
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True),
|
||||||
'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."),
|
'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."),
|
||||||
'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Shipping address for current sales order."),
|
'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."),
|
||||||
'order_policy': fields.selection([
|
'order_policy': fields.selection([
|
||||||
('manual', 'On Demand'),
|
('manual', 'On Demand'),
|
||||||
], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
|
], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
|
||||||
|
@ -710,7 +710,7 @@ class sale_order_line(osv.osv):
|
||||||
_description = 'Sales Order Line'
|
_description = 'Sales Order Line'
|
||||||
_columns = {
|
_columns = {
|
||||||
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
|
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||||
'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
|
'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||||
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
|
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
|
||||||
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
|
'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),
|
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
<field name="product_id"
|
<field name="product_id"
|
||||||
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
||||||
groups="base.group_user"
|
groups="base.group_user"
|
||||||
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
|
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
|
||||||
</field>
|
</field>
|
||||||
<field name="product_uom_qty" position="replace">
|
<field name="product_uom_qty" position="replace">
|
||||||
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -129,7 +129,7 @@
|
||||||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
|
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
|
||||||
<button name="%(action_view_change_standard_price)d" string="- update"
|
<button name="%(action_view_change_standard_price)d" string="- update"
|
||||||
type="action" attrs="{'invisible':[('cost_method','<>','average')]}"
|
type="action" attrs="{'invisible':[('cost_method','<>','average')]}"
|
||||||
class="oe_link"/>
|
class="oe_link" groups="product.group_costing_method"/>
|
||||||
</div>
|
</div>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -198,7 +198,7 @@
|
||||||
<para style="terp_default_Bold_9">Total:</para>
|
<para style="terp_default_Bold_9">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -215,7 +215,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
<para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
|
<para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -198,7 +198,7 @@
|
||||||
<para style="terp_default_Bold_9">Total:</para>
|
<para style="terp_default_Bold_9">Total:</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
@ -215,7 +215,7 @@
|
||||||
</para>
|
</para>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
|
<para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
|
|
Loading…
Reference in New Issue