pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20090630125623-as0x0ezfznscq5jv
This commit is contained in:
Fabien Pinckaers
2009-06-30 14:56:23 +02:00
parent f9e8e5f27f ed98567944
commit 849ba3bd85
34 changed files with 156 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/partner.py
+2 -1
View File
@@ -30,7 +30,8 @@ class account_fiscal_position(osv.osv):
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
'company_id': fields.many2one('res.company', 'Company'),
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping')
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
'note': fields.text('Notes', translate=True),
}
def map_tax(self, cr, uid, fposition_id, taxes, context={}):
addons/account/partner_view.xml
+3 -2
View File
@@ -11,7 +11,8 @@
<field name="name" select="1"/>
<field name="company_id"/>
<newline/>
<field name="tax_ids" colspan="4">
<field name="note" colspan="4"/>
<field name="tax_ids" colspan="4" widget="one2many_list">
<tree string="Tax Mapping" editable="bottom">
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -21,7 +22,7 @@
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</form>
</field>
<field name="account_ids" colspan="4">
<field name="account_ids" colspan="4" widget="one2many_list">
<tree string="Account Mapping" editable="bottom">
<field name="account_src_id"/>
<field name="account_dest_id"/>
addons/account/report/invoice.rml
+14
View File
@@ -404,5 +404,19 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="128.0,402.0" style="Table1">
<tr>
<td>
<para style="terp_default_Bold_9">Fiscal Position Remark :</para>
</td>
<td>
<para style="terp_default_9">[[ o.fiscal_position and format(o.fiscal_position.note) or removeParentNode('blockTable') ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>
addons/purchase/wizard/wizard_group.py
+9 -2
View File
@@ -27,13 +27,20 @@ import netsvc
import pooler
from osv.orm import browse_record, browse_null
merge_form = """<?xml version="1.0"?>
<form string="Merge orders">
<separator string="Are you sure you want to merge these orders ?"/>
<newline/>
<label string="Please note that orders will only be merged if they are to the same partner and going to the same location, and lines will only be merged if they are exactly the same except for the quantity and unit."/>
<label>Please note that:
- orders will only be merged if:
* their status is draft
* they belong to the same partner
* are going to the same location
- lines will only be merged if:
* they are exactly the same except for the quantity and unit</label>
</form>
"""
"""
merge_fields = {
}
addons/report_task/i18n/ar_AR.po
-2
View File
@@ -168,5 +168,3 @@ msgstr ""
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/bg_BG.po
+11 -1
View File
@@ -157,4 +157,14 @@ msgstr ""
#. module: report_task
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Невалиден XML за преглед
msgstr "Невалиден XML за преглед"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/bs_BS.po
+3 -1
View File
@@ -165,4 +165,6 @@ msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/ca_ES.po
+7 -1
View File
@@ -161,4 +161,10 @@ msgstr "XML invàlid per a la definició de la vista!"
#. module: report_task
#: field:report.closed.task,delay_hours:0
ms
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/cs_CS.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/cs_CZ.po
-2
View File
@@ -168,5 +168,3 @@ msgstr ""
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/de_DE.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/es_AR.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/es_ES.po
+9 -1
View File
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
msgstr "¡XML inválido para la definición de la vista!"
#. module: report_task
#: field:report.closed.task,delay_hours:
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/et_EE.po
+9 -1
View File
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
msgstr "Vigane XML vaate arhitektuurile!"
#. module: report_task
#: field:report.close
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/fr_FR.po
-2
View File
@@ -168,5 +168,3 @@ msgstr ""
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/hr_HR.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/hu_HU.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/it_IT.po
+9 -1
View File
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
msgstr "XML non valido per Visualizzazione Architettura!"
#. module: report_task
#: field:report.closed.task,delay_hou
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/lt_LT.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/nl_BE.po
+4 -1
View File
@@ -165,4 +165,7 @@ msgid "Delay Hours"
msgstr ""
#. module: report_task
#: fiel
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/nl_NL.po
+7 -1
View File
@@ -162,4 +162,10 @@ msgstr "Ongeldige XML voor overzicht"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
m
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/pl_PL.po
+9 -1
View File
@@ -160,4 +160,12 @@ msgid "Invalid XML for View Architecture!"
msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: report_task
#: field:report.closed.task,
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/pt_BR.po
+8 -1
View File
@@ -161,4 +161,11 @@ msgstr "Invalido XML para Arquitetura da View"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Del
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/pt_PT.po
+8 -1
View File
@@ -161,4 +161,11 @@ msgstr "XML inválido para a arquitectura de vista"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/report_task.pot
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/ro_RO.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo
addons/report_task/i18n/ru_RU.po
+12 -1
View File
@@ -157,4 +157,15 @@ msgstr ""
#. module: report_task
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Неправильный XML д
msgstr "Неправильный XML д!"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/sl_SL.po
+8 -1
View File
@@ -161,4 +161,11 @@ msgstr "Neveljaven XML za arhitekturo pogleda."
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Delay Hou
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/sv_SE.po
+4 -1
View File
@@ -165,4 +165,7 @@ msgid "Delay Hours"
msgstr ""
#. module: report_task
#:
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/sv_SV.po
+4 -1
View File
@@ -165,4 +165,7 @@ msgid "Delay Hours"
msgstr ""
#. module: report_task
#:
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/tr_TR.po
+4 -1
View File
@@ -165,4 +165,7 @@ msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/uk_UK.po
+12 -1
View File
@@ -157,4 +157,15 @@ msgstr ""
#. module: report_task
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Неправильний XML для Архітектури �
msgstr "Неправильний XML для Архітектури �"
#. module: report_task
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: report_task
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
addons/report_task/i18n/zh_CN.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module
addons/report_task/i18n/zh_TW.po
-1
View File
@@ -169,4 +169,3 @@ msgstr ""
msgid "Project"
msgstr ""
#. module: repo