credativ team mailing list archive
-
credativ team
-
Mailing list archive
-
Message #05180
[Merge] lp:~credativ/openobject-server/7.0-fixes-syslog into lp:openobject-server
mistotebe has proposed merging lp:~credativ/openobject-server/7.0-fixes-syslog into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~credativ/openobject-server/7.0-fixes-syslog/+merge/166847
When setting up multiple servers on a single machine, or just setting up cron workers to run in a separate process, one might want to keep the log streams separate. This has not been possible when logging through syslog. This proposal adds a configuration option to change the syslog facility.
--
https://code.launchpad.net/~credativ/openobject-server/7.0-fixes-syslog/+merge/166847
Your team credativ is subscribed to branch lp:~credativ/openobject-server/7.0-fixes-syslog.
=== modified file 'debian/copyright'
--- debian/copyright 2011-10-06 00:18:10 +0000
+++ debian/copyright 2013-05-31 16:31:27 +0000
@@ -40,7 +40,7 @@
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
@@ -93,7 +93,7 @@
.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Library General Public License
can be found in /usr/share/common-licenses/LGPL-2.1 file.
@@ -137,7 +137,7 @@
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
@@ -159,7 +159,7 @@
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
=== modified file 'history/check_profile_l10n_all.py'
--- history/check_profile_l10n_all.py 2011-11-07 15:45:01 +0000
+++ history/check_profile_l10n_all.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
=== modified file 'history/gen_graph.sh'
--- history/gen_graph.sh 2011-09-26 00:54:44 +0000
+++ history/gen_graph.sh 2013-05-31 16:31:27 +0000
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
=== modified file 'openerp-wsgi.py'
--- openerp-wsgi.py 2012-09-24 10:50:11 +0000
+++ openerp-wsgi.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# WSGI Handler sample configuration file.
#
# Change the appropriate settings below, in order to provide the parameters
=== modified file 'openerp/addons/base/currency_data.xml'
--- openerp/addons/base/currency_data.xml 2013-01-11 11:40:12 +0000
+++ openerp/addons/base/currency_data.xml 2013-05-31 16:31:27 +0000
@@ -9,7 +9,6 @@
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="position">before</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUSD" model="res.currency.rate">
<field name="rate">1.2834</field>
@@ -23,7 +22,6 @@
<field name="symbol">Bs.F</field>
<field name="rounding">0.0001</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateVEF" model="res.currency.rate">
<field name="rate">5.864</field>
@@ -36,7 +34,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCAD" model="res.currency.rate">
<field name="rate">1.3388</field>
@@ -50,7 +47,6 @@
<field name="symbol">CHF</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCHF" model="res.currency.rate">
<field name="rate">1.3086</field>
@@ -63,7 +59,6 @@
<field name="symbol">R$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBRL" model="res.currency.rate">
<field name="rate">2.2344</field>
@@ -76,7 +71,6 @@
<field name="symbol">¥</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCNY" model="res.currency.rate">
<field name="rate">8.7556</field>
@@ -90,7 +84,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCOP" model="res.currency.rate">
<field name="rate">2933.8378</field>
@@ -103,7 +96,6 @@
<field name="symbol">Kč</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCZK" model="res.currency.rate">
<field name="rate">26.5634</field>
@@ -116,7 +108,6 @@
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateDKK" model="res.currency.rate">
<field name="rate">7.4445</field>
@@ -130,7 +121,6 @@
<field name="symbol">Ft</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateHUF" model="res.currency.rate">
<field name="rate">271.5621</field>
@@ -143,7 +133,6 @@
<field name="symbol">Rp</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateIDR1" model="res.currency.rate">
<field name="rate">14352.00</field>
@@ -161,7 +150,6 @@
<field name="symbol">Ls</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLVL" model="res.currency.rate">
<field name="rate">0.7086</field>
@@ -174,7 +162,6 @@
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNOK" model="res.currency.rate">
<field name="rate">7.8668</field>
@@ -187,7 +174,6 @@
<field name="symbol">XPF</field>
<field name="rounding">1.00</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateXPF" model="res.currency.rate">
<field name="rate">119.331742</field>
@@ -200,7 +186,6 @@
<field name="symbol">B/.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePAB" model="res.currency.rate">
<field name="rate">1.2676</field>
@@ -213,7 +198,6 @@
<field name="symbol">zł</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePLN" model="res.currency.rate">
<field name="rate">4.1005</field>
@@ -226,7 +210,6 @@
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSEK" model="res.currency.rate">
<field name="rate">10.3004</field>
@@ -239,7 +222,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateARS" model="res.currency.rate">
<field name="rate">5.0881</field>
@@ -252,7 +234,6 @@
<field name="symbol">₹</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateINR" model="res.currency.rate">
<field name="rate">59.9739</field>
@@ -265,7 +246,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAUD" model="res.currency.rate">
<field name="rate">1.4070</field>
@@ -278,7 +258,6 @@
<field name="symbol">₴</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUAH" model="res.currency.rate">
<field name="rate">10.1969</field>
@@ -291,7 +270,6 @@
<field name="symbol">₫</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateVND" model="res.currency.rate">
<field name="rate">26330.01</field>
@@ -304,7 +282,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateHKD" model="res.currency.rate">
<field name="rate">11.1608</field>
@@ -317,7 +294,6 @@
<field name="symbol">¥</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateJPY" model="res.currency.rate">
<field name="rate">133.62</field>
@@ -330,7 +306,6 @@
<field name="symbol">лв</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBGN" model="res.currency.rate">
<field name="rate">1.9558</field>
@@ -343,7 +318,6 @@
<field name="symbol">Lt</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLTL" model="res.currency.rate">
<field name="rate">3.4528</field>
@@ -356,7 +330,6 @@
<field name="symbol">lei</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateRON" model="res.currency.rate">
<field name="rate">4.2253</field>
@@ -369,7 +342,6 @@
<field name="symbol">kn</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateHRK" model="res.currency.rate">
<field name="rate">7.2936</field>
@@ -382,7 +354,6 @@
<field name="symbol">руб</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateRUB" model="res.currency.rate">
<field name="rate">43.16</field>
@@ -395,7 +366,6 @@
<field name="symbol">TL</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTRY" model="res.currency.rate">
<field name="rate">2.1411</field>
@@ -408,7 +378,6 @@
<field name="symbol">₩</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKRW" model="res.currency.rate">
<field name="rate">1662.37</field>
@@ -421,7 +390,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMXN" model="res.currency.rate">
<field name="rate">18.6664</field>
@@ -434,7 +402,6 @@
<field name="symbol">RM</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMYR" model="res.currency.rate">
<field name="rate">4.8887</field>
@@ -447,7 +414,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNZD" model="res.currency.rate">
<field name="rate">1.9764</field>
@@ -460,7 +426,6 @@
<field name="symbol">Php</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePHP" model="res.currency.rate">
<field name="rate">66.1</field>
@@ -473,7 +438,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSGD" model="res.currency.rate">
<field name="rate">2.0126</field>
@@ -486,7 +450,6 @@
<field name="symbol">R</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateZAR" model="res.currency.rate">
<field name="rate">10.5618</field>
@@ -515,7 +478,6 @@
<field name="symbol">Rs</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMUR" model="res.currency.rate">
<field name="rate">40.28</field>
@@ -528,7 +490,6 @@
<field name="symbol">CFA</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateXOF" model="res.currency.rate">
<field name="rate">655.957</field>
@@ -541,7 +502,6 @@
<field name="symbol">FCFA</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateXAF" model="res.currency.rate">
<field name="rate">655.957</field>
@@ -554,7 +514,6 @@
<field name="symbol">USh</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUGX" model="res.currency.rate">
<field name="rate">3401.91388</field>
@@ -567,7 +526,6 @@
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateHNL" model="res.currency.rate">
<field name="rate">25</field>
@@ -580,7 +538,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCLP" model="res.currency.rate">
<field name="rate">710</field>
@@ -593,7 +550,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUYU" model="res.currency.rate">
<field name="currency_id" ref="UYU" />
@@ -606,7 +562,6 @@
<field name="symbol">Afs</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAFN" model="res.currency.rate">
<field name="currency_id" ref="AFN" />
@@ -619,7 +574,6 @@
<field name="symbol">Kz</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAOA" model="res.currency.rate">
<field name="currency_id" ref="AOA" />
@@ -632,7 +586,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateXCD" model="res.currency.rate">
<field name="currency_id" ref="XCD" />
@@ -645,7 +598,6 @@
<field name="symbol">դր.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAMD" model="res.currency.rate">
<field name="currency_id" ref="AMD" />
@@ -658,7 +610,6 @@
<field name="symbol">Afl.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAWG" model="res.currency.rate">
<field name="currency_id" ref="AWG" />
@@ -671,7 +622,6 @@
<field name="symbol">m</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAZN" model="res.currency.rate">
<field name="currency_id" ref="AZN" />
@@ -684,7 +634,6 @@
<field name="symbol">B$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBSD" model="res.currency.rate">
<field name="currency_id" ref="BSD" />
@@ -697,7 +646,6 @@
<field name="symbol">BD</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBHD" model="res.currency.rate">
<field name="currency_id" ref="BHD" />
@@ -710,7 +658,6 @@
<field name="symbol">৳</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBDT" model="res.currency.rate">
<field name="currency_id" ref="BDT" />
@@ -723,7 +670,6 @@
<field name="symbol">Bds$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBBD" model="res.currency.rate">
<field name="currency_id" ref="BBD" />
@@ -736,7 +682,6 @@
<field name="symbol">BR</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBYR" model="res.currency.rate">
<field name="currency_id" ref="BYR" />
@@ -749,7 +694,6 @@
<field name="symbol">BZ$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBZD" model="res.currency.rate">
<field name="currency_id" ref="BZD" />
@@ -762,7 +706,6 @@
<field name="symbol">BD$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBMD" model="res.currency.rate">
<field name="currency_id" ref="BMD" />
@@ -775,7 +718,6 @@
<field name="symbol">Nu.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBTN" model="res.currency.rate">
<field name="currency_id" ref="BTN" />
@@ -788,7 +730,6 @@
<field name="symbol">Bs.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBOB" model="res.currency.rate">
<field name="currency_id" ref="BOB" />
@@ -801,7 +742,6 @@
<field name="symbol">KM</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBAM" model="res.currency.rate">
<field name="currency_id" ref="BAM" />
@@ -814,7 +754,6 @@
<field name="symbol">P</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBWP" model="res.currency.rate">
<field name="currency_id" ref="BWP" />
@@ -827,7 +766,6 @@
<field name="symbol">FBu</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBIF" model="res.currency.rate">
<field name="currency_id" ref="BIF" />
@@ -840,7 +778,6 @@
<field name="symbol">៛</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKHR" model="res.currency.rate">
<field name="currency_id" ref="KHR" />
@@ -853,7 +790,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKYD" model="res.currency.rate">
<field name="currency_id" ref="KYD" />
@@ -866,7 +802,6 @@
<field name="symbol">CF</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKMF" model="res.currency.rate">
<field name="currency_id" ref="KMF" />
@@ -879,7 +814,6 @@
<field name="symbol">Fr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCDF" model="res.currency.rate">
<field name="currency_id" ref="CDF" />
@@ -892,7 +826,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCUP" model="res.currency.rate">
<field name="currency_id" ref="CUP" />
@@ -905,7 +838,6 @@
<field name="symbol">ƒ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateANG" model="res.currency.rate">
<field name="currency_id" ref="ANG" />
@@ -918,7 +850,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCYP" model="res.currency.rate">
<field name="currency_id" ref="CYP" />
@@ -931,7 +862,6 @@
<field name="symbol">Fdj</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateDJF" model="res.currency.rate">
<field name="currency_id" ref="DJF" />
@@ -944,7 +874,6 @@
<field name="symbol">RD$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateDOP" model="res.currency.rate">
<field name="currency_id" ref="DOP" />
@@ -957,7 +886,6 @@
<field name="name">TPE</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTPE" model="res.currency.rate">
<field name="currency_id" ref="TPE" />
@@ -970,7 +898,6 @@
<field name="symbol">S/.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateECS" model="res.currency.rate">
<field name="currency_id" ref="ECS" />
@@ -983,7 +910,6 @@
<field name="symbol">E£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateEGP" model="res.currency.rate">
<field name="currency_id" ref="EGP" />
@@ -996,7 +922,6 @@
<field name="symbol">¢</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSVC" model="res.currency.rate">
<field name="currency_id" ref="SVC" />
@@ -1009,7 +934,6 @@
<field name="symbol">Nfk</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateERN" model="res.currency.rate">
<field name="currency_id" ref="ERN" />
@@ -1022,7 +946,6 @@
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateEEK" model="res.currency.rate">
<field name="currency_id" ref="EEK" />
@@ -1035,7 +958,6 @@
<field name="symbol">Br</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateEEB" model="res.currency.rate">
<field name="currency_id" ref="ETB" />
@@ -1048,7 +970,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateFKP" model="res.currency.rate">
<field name="currency_id" ref="FKP" />
@@ -1061,7 +982,6 @@
<field name="symbol">FJ$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateFJD" model="res.currency.rate">
<field name="currency_id" ref="FJD" />
@@ -1074,7 +994,6 @@
<field name="symbol">ლ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGEL" model="res.currency.rate">
<field name="currency_id" ref="GEL" />
@@ -1087,7 +1006,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGIP" model="res.currency.rate">
<field name="currency_id" ref="GIP" />
@@ -1100,7 +1018,6 @@
<field name="symbol">Q</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateQTQ" model="res.currency.rate">
<field name="currency_id" ref="QTQ" />
@@ -1113,7 +1030,6 @@
<field name="symbol">FG</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGNF" model="res.currency.rate">
<field name="currency_id" ref="GNF" />
@@ -1125,7 +1041,6 @@
<field name="name">GWP</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGWP" model="res.currency.rate">
<field name="currency_id" ref="GWP" />
@@ -1138,7 +1053,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGYD" model="res.currency.rate">
<field name="currency_id" ref="GYD" />
@@ -1151,7 +1065,6 @@
<field name="symbol">G</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateHTG" model="res.currency.rate">
<field name="currency_id" ref="HTG" />
@@ -1164,7 +1077,6 @@
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateISK" model="res.currency.rate">
<field name="currency_id" ref="ISK" />
@@ -1177,7 +1089,6 @@
<field name="symbol">﷼</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateIRR" model="res.currency.rate">
<field name="currency_id" ref="IRR" />
@@ -1190,7 +1101,6 @@
<field name="symbol"> ع.د</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateIQD" model="res.currency.rate">
<field name="currency_id" ref="IQD" />
@@ -1203,7 +1113,6 @@
<field name="symbol">₪</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateILS" model="res.currency.rate">
<field name="currency_id" ref="ILS" />
@@ -1216,7 +1125,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateJMD" model="res.currency.rate">
<field name="currency_id" ref="JMD" />
@@ -1229,7 +1137,6 @@
<field name="symbol"> د.ا </field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateJOD" model="res.currency.rate">
<field name="currency_id" ref="JOD" />
@@ -1242,7 +1149,6 @@
<field name="symbol">лв</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKZT" model="res.currency.rate">
<field name="currency_id" ref="KZT" />
@@ -1255,7 +1161,6 @@
<field name="symbol">KSh</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKES" model="res.currency.rate">
<field name="currency_id" ref="KES" />
@@ -1268,7 +1173,6 @@
<field name="symbol"> د.ك </field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKWD" model="res.currency.rate">
<field name="currency_id" ref="KWD" />
@@ -1281,7 +1185,6 @@
<field name="symbol">лв</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKGS" model="res.currency.rate">
<field name="currency_id" ref="KGS" />
@@ -1294,7 +1197,6 @@
<field name="symbol">₭</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLAK" model="res.currency.rate">
<field name="currency_id" ref="LAK" />
@@ -1307,7 +1209,6 @@
<field name="symbol">ل.ل</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLBP" model="res.currency.rate">
<field name="currency_id" ref="LBP" />
@@ -1320,7 +1221,6 @@
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLSL" model="res.currency.rate">
<field name="currency_id" ref="LSL" />
@@ -1333,7 +1233,6 @@
<field name="symbol">L$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLRD" model="res.currency.rate">
<field name="currency_id" ref="LRD" />
@@ -1346,7 +1245,6 @@
<field name="symbol"> ل.د </field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLYD" model="res.currency.rate">
<field name="currency_id" ref="LYD" />
@@ -1359,7 +1257,6 @@
<field name="symbol">MOP$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMOP" model="res.currency.rate">
<field name="currency_id" ref="MOP" />
@@ -1372,7 +1269,6 @@
<field name="symbol">ден</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMKD" model="res.currency.rate">
<field name="currency_id" ref="MKD" />
@@ -1385,7 +1281,6 @@
<field name="symbol">Ar</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMGA" model="res.currency.rate">
<field name="currency_id" ref="MGA" />
@@ -1398,7 +1293,6 @@
<field name="symbol">MK</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMWK" model="res.currency.rate">
<field name="currency_id" ref="MWK" />
@@ -1411,7 +1305,6 @@
<field name="symbol">.ރ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMVR" model="res.currency.rate">
<field name="currency_id" ref="MVR" />
@@ -1424,7 +1317,6 @@
<field name="symbol">UM</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMRO" model="res.currency.rate">
<field name="currency_id" ref="MRO" />
@@ -1437,7 +1329,6 @@
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMDL" model="res.currency.rate">
<field name="currency_id" ref="MDL" />
@@ -1450,7 +1341,6 @@
<field name="symbol">₮</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMNT" model="res.currency.rate">
<field name="currency_id" ref="MNT" />
@@ -1463,7 +1353,6 @@
<field name="symbol"> د.م. </field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMAD" model="res.currency.rate">
<field name="currency_id" ref="MAD" />
@@ -1476,7 +1365,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateBND" model="res.currency.rate">
<field name="currency_id" ref="BND" />
@@ -1489,7 +1377,6 @@
<field name="symbol">DZ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateDZD" model="res.currency.rate">
<field name="currency_id" ref="DZD" />
@@ -1502,7 +1389,6 @@
<field name="symbol">GH¢</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGHS" model="res.currency.rate">
<field name="currency_id" ref="GHS" />
@@ -1515,7 +1401,6 @@
<field name="symbol">D</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGMD" model="res.currency.rate">
<field name="currency_id" ref="GMD" />
@@ -1528,7 +1413,6 @@
<field name="symbol">Ƶ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateZRZ" model="res.currency.rate">
<field name="currency_id" ref="ZRZ" />
@@ -1541,7 +1425,6 @@
<field name="symbol">MT</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMZN" model="res.currency.rate">
<field name="currency_id" ref="MZN" />
@@ -1554,7 +1437,6 @@
<field name="symbol">K</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateMMK" model="res.currency.rate">
<field name="currency_id" ref="MMK" />
@@ -1567,7 +1449,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNAD" model="res.currency.rate">
<field name="currency_id" ref="NAD" />
@@ -1580,7 +1461,6 @@
<field name="symbol">₨</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNPR" model="res.currency.rate">
<field name="currency_id" ref="NPR" />
@@ -1593,7 +1473,6 @@
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateALL" model="res.currency.rate">
<field name="currency_id" ref="ALL" />
@@ -1606,7 +1485,6 @@
<field name="symbol">C$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNIO" model="res.currency.rate">
<field name="currency_id" ref="NIO" />
@@ -1619,7 +1497,6 @@
<field name="symbol">₦</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateNGN" model="res.currency.rate">
<field name="currency_id" ref="NGN" />
@@ -1632,7 +1509,6 @@
<field name="symbol">₩</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateKPW" model="res.currency.rate">
<field name="currency_id" ref="KPW" />
@@ -1645,7 +1521,6 @@
<field name="symbol">Z$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateZWD" model="res.currency.rate">
<field name="currency_id" ref="ZWD" />
@@ -1658,7 +1533,6 @@
<field name="symbol">ZK</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateZMK" model="res.currency.rate">
<field name="currency_id" ref="ZMK" />
@@ -1671,7 +1545,6 @@
<field name="symbol">﷼</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateYER" model="res.currency.rate">
<field name="currency_id" ref="YER" />
@@ -1684,7 +1557,6 @@
<field name="symbol">Bs</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateVUB" model="res.currency.rate">
<field name="currency_id" ref="VUB" />
@@ -1697,7 +1569,6 @@
<field name="symbol">€</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateEUR" model="res.currency.rate">
<field name="currency_id" ref="EUR" />
@@ -1710,7 +1581,6 @@
<field name="symbol">VT</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateVUV" model="res.currency.rate">
<field name="currency_id" ref="VUV" />
@@ -1723,7 +1593,6 @@
<field name="symbol">лв</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUZS" model="res.currency.rate">
<field name="currency_id" ref="UZS" />
@@ -1736,7 +1605,6 @@
<field name="symbol">$U</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUYP" model="res.currency.rate">
<field name="currency_id" ref="UYP" />
@@ -1749,7 +1617,6 @@
<field name="symbol">د.إ</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateAED" model="res.currency.rate">
<field name="currency_id" ref="AED" />
@@ -1762,7 +1629,6 @@
<field name="symbol">₴</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateUAG" model="res.currency.rate">
<field name="currency_id" ref="UAG" />
@@ -1775,7 +1641,6 @@
<field name="symbol">m</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTMM" model="res.currency.rate">
<field name="currency_id" ref="TMM" />
@@ -1788,7 +1653,6 @@
<field name="symbol">TL</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTRL" model="res.currency.rate">
<field name="currency_id" ref="TRL" />
@@ -1801,7 +1665,6 @@
<field name="symbol">DT</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTND" model="res.currency.rate">
<field name="currency_id" ref="TND" />
@@ -1814,7 +1677,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTTD" model="res.currency.rate">
<field name="currency_id" ref="TTD" />
@@ -1827,7 +1689,6 @@
<field name="symbol">T$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTOP" model="res.currency.rate">
<field name="currency_id" ref="TOP" />
@@ -1840,7 +1701,6 @@
<field name="symbol">฿</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTHB" model="res.currency.rate">
<field name="currency_id" ref="THB" />
@@ -1853,7 +1713,6 @@
<field name="symbol">x/y</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTZS" model="res.currency.rate">
<field name="currency_id" ref="TZS" />
@@ -1865,7 +1724,6 @@
<field name="name">TJR</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTJR" model="res.currency.rate">
<field name="currency_id" ref="TJR" />
@@ -1878,7 +1736,6 @@
<field name="symbol">NT$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateTWD" model="res.currency.rate">
<field name="currency_id" ref="TWD" />
@@ -1891,7 +1748,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSYP" model="res.currency.rate">
<field name="currency_id" ref="SYP" />
@@ -1904,7 +1760,6 @@
<field name="symbol">E</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSZL" model="res.currency.rate">
<field name="currency_id" ref="SZL" />
@@ -1917,7 +1772,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSRG" model="res.currency.rate">
<field name="currency_id" ref="SRG" />
@@ -1930,7 +1784,6 @@
<field name="symbol">£Sd</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSDD" model="res.currency.rate">
<field name="currency_id" ref="SDD" />
@@ -1943,7 +1796,6 @@
<field name="symbol">Rs</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateLKR" model="res.currency.rate">
<field name="currency_id" ref="LKR" />
@@ -1956,7 +1808,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSSP" model="res.currency.rate">
<field name="currency_id" ref="SSP" />
@@ -1970,7 +1821,6 @@
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="position">before</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateGBP" model="res.currency.rate">
<field name="currency_id" ref="GBP" />
@@ -1983,7 +1833,6 @@
<field name="symbol">Sh.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSOD" model="res.currency.rate">
<field name="currency_id" ref="SOD" />
@@ -1996,7 +1845,6 @@
<field name="symbol">SI$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSBD" model="res.currency.rate">
<field name="currency_id" ref="SBD" />
@@ -2009,7 +1857,6 @@
<field name="symbol">Le</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSLL" model="res.currency.rate">
<field name="currency_id" ref="SLL" />
@@ -2022,7 +1869,6 @@
<field name="symbol">SR</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSCR" model="res.currency.rate">
<field name="currency_id" ref="SCR" />
@@ -2035,7 +1881,6 @@
<field name="symbol">din.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateRSD" model="res.currency.rate">
<field name="currency_id" ref="RSD" />
@@ -2048,7 +1893,6 @@
<field name="symbol">SR</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSAR" model="res.currency.rate">
<field name="currency_id" ref="SAR" />
@@ -2061,7 +1905,6 @@
<field name="symbol">Db</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSTD" model="res.currency.rate">
<field name="currency_id" ref="STD" />
@@ -2074,7 +1917,6 @@
<field name="symbol">₤</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateITL" model="res.currency.rate">
<field name="currency_id" ref="ITL" />
@@ -2087,7 +1929,6 @@
<field name="symbol">WS$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateWST" model="res.currency.rate">
<field name="currency_id" ref="WST" />
@@ -2100,7 +1941,6 @@
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSHP" model="res.currency.rate">
<field name="currency_id" ref="SHP" />
@@ -2113,7 +1953,6 @@
<field name="symbol">RF</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateRWF" model="res.currency.rate">
<field name="currency_id" ref="RWF" />
@@ -2126,7 +1965,6 @@
<field name="symbol">R</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateRUR" model="res.currency.rate">
<field name="currency_id" ref="RUR" />
@@ -2139,7 +1977,6 @@
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateROL" model="res.currency.rate">
<field name="currency_id" ref="ROL" />
@@ -2152,7 +1989,6 @@
<field name="symbol">QR</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateQAR" model="res.currency.rate">
<field name="currency_id" ref="QAR" />
@@ -2165,7 +2001,6 @@
<field name="symbol">zł</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePLZ" model="res.currency.rate">
<field name="currency_id" ref="PLZ" />
@@ -2178,7 +2013,6 @@
<field name="symbol">S/.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePEN" model="res.currency.rate">
<field name="currency_id" ref="PEN" />
@@ -2191,7 +2025,6 @@
<field name="symbol">₲</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePYG" model="res.currency.rate">
<field name="currency_id" ref="PYG" />
@@ -2204,7 +2037,6 @@
<field name="symbol">K</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePGK" model="res.currency.rate">
<field name="currency_id" ref="PGK" />
@@ -2217,7 +2049,6 @@
<field name="symbol">Rs.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="ratePKR" model="res.currency.rate">
<field name="currency_id" ref="PKR" />
@@ -2230,7 +2061,6 @@
<field name="symbol">ر.ع.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateOMR" model="res.currency.rate">
<field name="currency_id" ref="OMR" />
@@ -2243,7 +2073,6 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateCVE" model="res.currency.rate">
<field name="currency_id" ref="CVE" />
@@ -2256,7 +2085,6 @@
<field name="symbol">Sk</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSKK" model="res.currency.rate">
<field name="currency_id" ref="SKK" />
@@ -2268,7 +2096,6 @@
<field name="name">SIT</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateSIT" model="res.currency.rate">
<field name="currency_id" ref="SIT" />
@@ -2281,7 +2108,6 @@
<field name="symbol">дин.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
- <field name="company_id" ref="main_company"/>
</record>
<record id="rateYUM" model="res.currency.rate">
<field name="currency_id" ref="YUM" />
=== modified file 'openerp/addons/base/i18n/es.po'
--- openerp/addons/base/i18n/es.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/es.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,29 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-26 14:21+0000\n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-21 11:03+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:41+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-22 05:27+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -1182,6 +1194,18 @@
msgstr "Actualización de módulo"
#. module: base
+<<<<<<< TREE
+=======
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "ZIP"
+msgstr "C.P."
+
+#. module: base
+>>>>>>> MERGE-SOURCE
#: selection:base.language.install,lang:0
msgid "Spanish (UY) / Español (UY)"
msgstr "Spanish (UY) / Español (UY)"
=== modified file 'openerp/addons/base/i18n/es_CR.po'
--- openerp/addons/base/i18n/es_CR.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/es_CR.po 2013-05-31 16:31:27 +0000
@@ -6,17 +6,30 @@
msgid ""
msgstr ""
"Project-Id-Version: openobject-server\n"
+<<<<<<< TREE
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-02-10 17:23+0000\n"
"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@xxxxxxxxx>\n"
+=======
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-29 22:02+0000\n"
+"Last-Translator: Carlos Vásquez (CLEARCORP) "
+"<carlos.vasquez@xxxxxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Spanish (Costa Rica) <es_CR@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:43+0000\n"
"X-Generator: Launchpad (build 16652)\n"
"Language: \n"
+=======
+"X-Launchpad-Export-Date: 2013-05-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16652)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -26,10 +39,22 @@
"================================================\n"
" "
msgstr ""
-"\n"
-"Módulo para la creación e impresión de cheques\n"
-"================================================\n"
-" "
+<<<<<<< TREE
+"\n"
+"Módulo para la creación e impresión de cheques\n"
+"================================================\n"
+" "
+=======
+"\n"
+"Módulo para la creación e impresión de cheques\n"
+"================================================\n"
+" "
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:res.country,name:base.sh
=== modified file 'openerp/addons/base/i18n/fr.po'
--- openerp/addons/base/i18n/fr.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/fr.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-06 10:07+0000\n"
"Last-Translator: Quentin THEURET <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-13 14:03+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@xxxxxxxxxxxxxx>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:37+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -8961,7 +8975,16 @@
#. module: base
#: field:change.password.user,user_login:0
msgid "User Login"
-msgstr "Identifiant"
+<<<<<<< TREE
+msgstr "Identifiant"
+=======
+msgstr "Identifiant"
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters created by myself"
+msgstr "Mes filtres"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -9184,6 +9207,15 @@
#. module: base
#: view:res.partner:0
+<<<<<<< TREE
+=======
+#: view:res.users:0
+msgid "Tags..."
+msgstr "Étiquettes..."
+
+#. module: base
+#: view:res.partner:0
+>>>>>>> MERGE-SOURCE
msgid "at"
msgstr ""
@@ -9208,6 +9240,14 @@
msgstr "Format de fichier"
#. module: base
+<<<<<<< TREE
+=======
+#: view:ir.filters:0
+msgid "My filters"
+msgstr "Mes filtres"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
#: field:res.lang,iso_code:0
msgid "ISO code"
msgstr "Code ISO"
@@ -9962,7 +10002,17 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_followup
msgid "Payment Follow-up Management"
-msgstr "Gestion des relances de paiement"
+<<<<<<< TREE
+msgstr "Gestion des relances de paiement"
+=======
+msgstr "Gestion des relances de paiement"
+
+#. module: base
+#: code:addons/orm.py:5334
+#, python-format
+msgid "The value for the field '%s' already exists."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: base
#: field:workflow.workitem,inst_id:0
=== modified file 'openerp/addons/base/i18n/id.po'
--- openerp/addons/base/i18n/id.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/id.po 2013-05-31 16:31:27 +0000
@@ -7,15 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-02-22 17:30+0000\n"
"Last-Translator: Agus Purnomo <goesspoerr@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-13 05:49+0000\n"
+"Last-Translator: David Leonardi <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Indonesian <id@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:38+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-14 06:25+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -25,9 +36,20 @@
"================================================\n"
" "
msgstr ""
-"\n"
-"Modul untuk menulis dan mencetak Cek\n"
-" "
+<<<<<<< TREE
+"\n"
+"Modul untuk menulis dan mencetak Cek\n"
+" "
+=======
+"\n"
+"Modul untuk menulis dan mencetak Cek\n"
+" "
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:res.country,name:base.sh
=== modified file 'openerp/addons/base/i18n/ko.po'
--- openerp/addons/base/i18n/ko.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/ko.po 2013-05-31 16:31:27 +0000
@@ -7,15 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-08-20 15:29+0000\n"
"Last-Translator: ekodaq <ceo@xxxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-18 23:13+0000\n"
+"Last-Translator: AhnJD <zion64@xxxxxxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Korean <ko@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:39+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-19 06:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
=== modified file 'openerp/addons/base/i18n/lt.po'
--- openerp/addons/base/i18n/lt.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/lt.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-08-20 15:52+0000\n"
"Last-Translator: Paulius Sladkevičius <paulius@xxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-07 09:54+0000\n"
+"Last-Translator: Paulius Sladkevičius <paulius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:39+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
=== modified file 'openerp/addons/base/i18n/pl.po'
--- openerp/addons/base/i18n/pl.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/pl.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-17 20:05+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@xxxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-22 00:01+0000\n"
+"Last-Translator: Andrzej Grymkowski <andrzejgrymkowski@xxxxxxxxx>\n"
+"Language-Team: Polish <pl@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:40+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-23 06:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -703,6 +717,14 @@
msgstr "Sprzedaż i zakupy"
#. module: base
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Put an internal note..."
+msgstr "Wstaw wewnętrzą notatkę"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
#: view:ir.translation:0
msgid "Untranslated"
msgstr "Nieprzetłumaczono"
=== modified file 'openerp/addons/base/i18n/ro.po'
--- openerp/addons/base/i18n/ro.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/ro.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-01-05 18:18+0000\n"
"Last-Translator: Fekete Mihai <mihai@xxxxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-07 16:32+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+"Language-Team: Romanian <ro@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:40+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-08 06:17+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
=== modified file 'openerp/addons/base/i18n/ru.po'
--- openerp/addons/base/i18n/ru.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/ru.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-01-24 13:14+0000\n"
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-30 09:02+0000\n"
+"Last-Translator: Paul Korotkov <korotkov.paul@xxxxxxxxx>\n"
+"Language-Team: Russian <ru@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:40+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-31 07:00+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -9524,7 +9538,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_status
msgid "State/Stage Management"
-msgstr "Управление этапами/состояниями"
+msgstr "Управление этапами/стадиями"
#. module: base
#: model:ir.module.category,name:base.module_category_warehouse_management
@@ -12473,7 +12487,7 @@
#: view:res.partner.bank:0
#: view:res.users:0
msgid "State"
-msgstr "Состояние"
+msgstr "Область"
#. module: base
#: selection:base.language.install,lang:0
=== modified file 'openerp/addons/base/i18n/sl.po'
--- openerp/addons/base/i18n/sl.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/sl.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,29 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-15 19:04+0000\n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-20 14:30+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dušan Laznik (Mentis) <laznik@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:41+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-21 05:43+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
=== modified file 'openerp/addons/base/i18n/tr.po'
--- openerp/addons/base/i18n/tr.po 2013-05-30 05:44:44 +0000
+++ openerp/addons/base/i18n/tr.po 2013-05-31 16:31:27 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-11-28 08:41+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-05-25 17:44+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-05-30 05:42+0000\n"
"X-Generator: Launchpad (build 16652)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-26 05:39+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
=== modified file 'openerp/addons/base/ir/ir_attachment.py'
--- openerp/addons/base/ir/ir_attachment.py 2013-04-11 07:30:17 +0000
+++ openerp/addons/base/ir/ir_attachment.py 2013-05-31 16:31:27 +0000
@@ -198,7 +198,7 @@
continue
res_ids.setdefault(rmod,set()).add(rid)
if values:
- if 'res_model' in values and 'res_id' in values:
+ if values.get('res_model') and 'res_id' in values:
res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
ima = self.pool.get('ir.model.access')
=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py 2013-03-27 15:38:43 +0000
+++ openerp/addons/base/ir/ir_mail_server.py 2013-05-31 16:31:27 +0000
@@ -31,6 +31,7 @@
import smtplib
import threading
+from openerp import SUPERUSER_ID
from openerp.osv import osv, fields
from openerp.tools.translate import _
from openerp.tools import html2text
@@ -419,11 +420,11 @@
# Get SMTP Server Details from Mail Server
mail_server = None
if mail_server_id:
- mail_server = self.browse(cr, uid, mail_server_id)
+ mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id)
elif not smtp_server:
- mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1)
+ mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1)
if mail_server_ids:
- mail_server = self.browse(cr, uid, mail_server_ids[0])
+ mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0])
if mail_server:
smtp_server = mail_server.smtp_host
=== modified file 'openerp/addons/base/ir/ir_sequence.py'
--- openerp/addons/base/ir/ir_sequence.py 2013-04-19 15:49:20 +0000
+++ openerp/addons/base/ir/ir_sequence.py 2013-05-31 16:31:27 +0000
@@ -54,6 +54,34 @@
"""
_name = 'ir.sequence'
_order = 'name'
+
+ def _get_number_next_actual(self, cr, user, ids, field_name, arg, context=None):
+ '''Return number from ir_sequence row when no_gap implementation,
+ and number from postgres sequence when standard implementation.'''
+ res = dict.fromkeys(ids)
+ for element in self.browse(cr, user, ids, context=context):
+ if element.implementation != 'standard':
+ res[element.id] = element.number_next
+ else:
+ # get number from postgres sequence. Cannot use
+ # currval, because that might give an error when
+ # not having used nextval before.
+ statement = (
+ "SELECT last_value, increment_by, is_called"
+ " FROM ir_sequence_%03d"
+ % element.id)
+ cr.execute(statement)
+ (last_value, increment_by, is_called) = cr.fetchone()
+ if is_called:
+ res[element.id] = last_value + increment_by
+ else:
+ res[element.id] = last_value
+ return res
+
+ def _set_number_next_actual(self, cr, uid, id, name, value, args=None, context=None):
+ return self.write(cr, uid, id, {'number_next': value or 0}, context=context)
+
+
_columns = {
'name': openerp.osv.fields.char('Name', size=64, required=True),
'code': openerp.osv.fields.selection(_code_get, 'Code', size=64),
@@ -67,6 +95,7 @@
'prefix': openerp.osv.fields.char('Prefix', size=64, help="Prefix value of the record for the sequence"),
'suffix': openerp.osv.fields.char('Suffix', size=64, help="Suffix value of the record for the sequence"),
'number_next': openerp.osv.fields.integer('Next Number', required=True, help="Next number of this sequence"),
+ 'number_next_actual': openerp.osv.fields.function(_get_number_next_actual, fnct_inv=_set_number_next_actual, type='integer', required=True, string='Next Number', help='Next number that will be used. This number can be incremented frequently so the displayed value might already be obsolete'),
'number_increment': openerp.osv.fields.integer('Increment Number', required=True, help="The next number of the sequence will be incremented by this number"),
'padding' : openerp.osv.fields.integer('Number Padding', required=True, help="OpenERP will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."),
'company_id': openerp.osv.fields.many2one('res.company', 'Company'),
@@ -77,6 +106,7 @@
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', context=c),
'number_increment': 1,
'number_next': 1,
+ 'number_next_actual': 1,
'padding' : 0,
}
@@ -121,7 +151,7 @@
# object depends on it.
cr.execute("DROP SEQUENCE IF EXISTS %s RESTRICT " % names)
- def _alter_sequence(self, cr, id, number_increment, number_next):
+ def _alter_sequence(self, cr, id, number_increment, number_next=None):
""" Alter a PostreSQL sequence.
There is no access rights check.
@@ -129,9 +159,15 @@
if number_increment == 0:
raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
assert isinstance(id, (int, long))
- cr.execute("""
- ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %%s RESTART WITH %%s
- """ % id, (number_increment, number_next))
+ seq_name = 'ir_sequence_%03d' % (id,)
+ cr.execute("SELECT relname FROM pg_class WHERE relkind = %s AND relname=%s", ('S', seq_name))
+ if not cr.fetchone():
+ # sequence is not created yet, we're inside create() so ignore it, will be set later
+ return
+ statement = "ALTER SEQUENCE %s INCREMENT BY %d" % (seq_name, number_increment)
+ if number_next is not None:
+ statement += " RESTART WITH %d" % (number_next, )
+ cr.execute(statement)
def create(self, cr, uid, values, context=None):
""" Create a sequence, in implementation == standard a fast gaps-allowed PostgreSQL sequence is used.
@@ -160,7 +196,13 @@
n = values.get('number_next', row['number_next'])
if row['implementation'] == 'standard':
if new_implementation in ('standard', None):
- self._alter_sequence(cr, row['id'], i, n)
+ # Implementation has NOT changed.
+ # Only change sequence if really requested.
+ if row['number_next'] != n:
+ self._alter_sequence(cr, row['id'], i, n)
+ else:
+ # Just in case only increment changed
+ self._alter_sequence(cr, row['id'], i)
else:
self._drop_sequence(cr, row['id'])
else:
@@ -200,7 +242,7 @@
force_company = context.get('force_company')
if not force_company:
force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
- sequences = self.read(cr, uid, seq_ids, ['company_id','implementation','number_next','prefix','suffix','padding'])
+ sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
seq = preferred_sequences[0] if preferred_sequences else sequences[0]
if seq['implementation'] == 'standard':
@@ -210,8 +252,11 @@
cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
d = self._interpolation_dict()
- interpolated_prefix = self._interpolate(seq['prefix'], d)
- interpolated_suffix = self._interpolate(seq['suffix'], d)
+ try:
+ interpolated_prefix = self._interpolate(seq['prefix'], d)
+ interpolated_suffix = self._interpolate(seq['suffix'], d)
+ except ValueError:
+ raise osv.except_osv(_('Warning'), _('Invalid prefix or suffix for sequence \'%s\'') % (seq.get('name')))
return interpolated_prefix + '%%0%sd' % seq['padding'] % seq['number_next'] + interpolated_suffix
def next_by_id(self, cr, uid, sequence_id, context=None):
=== modified file 'openerp/addons/base/ir/ir_sequence_view.xml'
--- openerp/addons/base/ir/ir_sequence_view.xml 2012-10-13 12:09:24 +0000
+++ openerp/addons/base/ir/ir_sequence_view.xml 2013-05-31 16:31:27 +0000
@@ -20,7 +20,7 @@
<field name="suffix"/>
<field name="padding"/>
<field name="number_increment"/>
- <field name="number_next"/>
+ <field name="number_next_actual"/>
<field name="implementation"/>
</group>
<group col="3" string="Legend (for prefix, suffix)">
@@ -57,7 +57,7 @@
<field name="prefix"/>
<field name="padding"/>
<field name="company_id" groups="base.group_multi_company"/>
- <field name="number_next"/>
+ <field name="number_next_actual"/>
<field name="number_increment"/>
<field name="implementation"/>
</tree>
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py 2013-05-15 13:34:50 +0000
+++ openerp/addons/base/res/res_company.py 2013-05-31 16:31:27 +0000
@@ -278,6 +278,10 @@
<header>
<pageTemplate>
<frame id="first" x1="28.0" y1="28.0" width="%s" height="%s"/>
+ <stylesheet>
+ <!-- Set here the default font to use for all <para> tags -->
+ <paraStyle name='Normal' fontName="DejaVu Sans"/>
+ </stylesheet>
<pageGraphics>
<fill color="black"/>
<stroke color="black"/>
@@ -287,6 +291,9 @@
<drawCentredString x="%s" y="%s">[[ company.partner_id.name ]]</drawCentredString>
<stroke color="#000000"/>
<lines>%s</lines>
+ <!-- Set here the default font to use for all <drawString> tags -->
+ <!-- don't forget to change the 2 other occurence of <setFont> above if needed -->
+ <setFont name="DejaVu Sans" size="8"/>
</pageGraphics>
</pageTemplate>
</header>"""
@@ -310,13 +317,16 @@
<pageTemplate>
<frame id="first" x1="1.3cm" y1="3.0cm" height="%s" width="19.0cm"/>
<stylesheet>
- <paraStyle name="main_footer" fontName="DejaVu Sans" fontSize="8.0" alignment="CENTER"/>
- <paraStyle name="main_header" fontName="DejaVu Sans" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <!-- Set here the default font to use for all <para> tags -->
+ <paraStyle name='Normal' fontName="DejaVu Sans"/>
+ <paraStyle name="main_footer" fontSize="8.0" alignment="CENTER"/>
+ <paraStyle name="main_header" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<pageGraphics>
+ <!-- Set here the default font to use for all <drawString> tags -->
+ <setFont name="DejaVu Sans" size="8"/>
<!-- You Logo - Change X,Y,Width and Height -->
<image x="1.3cm" y="%s" height="40.0" >[[ company.logo or removeParentNode('image') ]]</image>
- <setFont name="DejaVu Sans" size="8"/>
<fill color="black"/>
<stroke color="black"/>
=== modified file 'openerp/addons/base/res/res_currency.py'
--- openerp/addons/base/res/res_currency.py 2013-05-07 12:01:49 +0000
+++ openerp/addons/base/res/res_currency.py 2013-05-31 16:31:27 +0000
@@ -77,6 +77,7 @@
'position' : 'after',
'rounding': 0.01,
'accuracy': 4,
+ 'company_id': False,
}
_sql_constraints = [
# this constraint does not cover all cases due to SQL NULL handling for company_id,
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2013-04-25 17:14:44 +0000
+++ openerp/addons/base/res/res_partner.py 2013-05-31 16:31:27 +0000
@@ -74,7 +74,8 @@
def _tz_get(self,cr,uid, context=None):
- return [(x, x) for x in pytz.all_timezones]
+ # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
+ return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
class res_partner_category(osv.osv):
=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml 2012-10-23 11:11:22 +0000
+++ openerp/addons/base/security/base_security.xml 2013-05-31 16:31:27 +0000
@@ -87,6 +87,12 @@
<field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
</record>
+ <record id="res_currency_rule" model="ir.rule">
+ <field name="name">multi-company currency rule</field>
+ <field model="ir.model" name="model_id" ref="model_res_currency"/>
+ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+ </record>
+
</data>
</openerp>
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2012-10-23 11:11:22 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2013-05-31 16:31:27 +0000
@@ -114,7 +114,7 @@
"access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
"access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
-"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
+"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1
"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
"access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
=== modified file 'openerp/addons/base/test/test_osv_expression.yml'
--- openerp/addons/base/test/test_osv_expression.yml 2012-10-19 04:28:56 +0000
+++ openerp/addons/base/test/test_osv_expression.yml 2013-05-31 16:31:27 +0000
@@ -291,22 +291,22 @@
assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101)
assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102)
-
- Property of the query (one2many != False).
--
- !python {model: res.currency }: |
- ids = self.search(cr, uid, [])
- referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
- companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)]))
- assert referenced_companies == companies
--
- Property of the query (one2many = False).
--
- !python {model: res.currency }: |
- ids = self.search(cr, uid, [])
- referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)])
- unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies)
- companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)]))
- assert unreferenced_companies == companies
+ Verify domain evaluation for `one2many != False`
+-
+ !python {model: res.partner.category }: |
+ all_ids = self.search(cr, uid, [])
+ parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+ result = set(self.search(cr, uid, [('child_ids', '!=', False)]))
+ assert result and result == parent_categs, "Got %r, expected %r" % (result, parent_categs)
+-
+ Verify domain evaluation for `one2many == False`
+-
+ !python {model: res.partner.category }: |
+ all_ids = self.search(cr, uid, [])
+ parent_categs = set([c.parent_id.id for c in self.browse(cr, uid, all_ids) if c.parent_id])
+ leaf_categs = set(all_ids) - parent_categs
+ result = set(self.search(cr, uid, [('child_ids', '=', False)]))
+ assert result and result == leaf_categs, "Got %r, expected %r" % (result, leaf_categs)
-
Equivalent queries.
-
=== added file 'openerp/addons/base_quality_interrogation.py.OTHER'
--- openerp/addons/base_quality_interrogation.py.OTHER 1970-01-01 00:00:00 +0000
+++ openerp/addons/base_quality_interrogation.py.OTHER 2013-05-31 16:31:27 +0000
@@ -0,0 +1,353 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import xmlrpclib
+import optparse
+import sys
+import threading
+import os
+import time
+import base64
+import socket
+import string
+
+admin_passwd = 'admin'
+waittime = 10
+wait_count = 0
+wait_limit = 12
+
+def to_decode(s):
+ try:
+ return s.encode('utf-8')
+ except UnicodeError:
+ try:
+ return s.encode('latin')
+ except UnicodeError:
+ try:
+ return s.decode('ascii')
+ except UnicodeError:
+ return s
+
+def start_server(root_path, port, netport, addons_path):
+ os.system('python2.5 %sopenerp-server --pidfile=openerp.pid --no-xmlrpcs --xmlrpc-port=%s --netrpc-port=%s --addons-path=%s' %(root_path, str(port),str(netport),addons_path))
+def clean():
+ if os.path.isfile('openerp.pid'):
+ ps = open('openerp.pid')
+ if ps:
+ pid = int(ps.read())
+ ps.close()
+ if pid:
+ os.kill(pid,9)
+
+def execute(connector, method, *args):
+ global wait_count
+ res = False
+ try:
+ res = getattr(connector,method)(*args)
+ except socket.error,e:
+ if e.args[0] == 111:
+ if wait_count > wait_limit:
+ print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds." % wait_limit
+ clean()
+ sys.exit(1)
+ print 'Please wait %d sec to start server....' % waittime
+ wait_count += 1
+ time.sleep(waittime)
+ res = execute(connector, method, *args)
+ else:
+ raise e
+ wait_count = 0
+ return res
+
+def login(uri, dbname, user, pwd):
+ conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
+ uid = execute(conn,'login',dbname, user, pwd)
+ return uid
+
+def import_translate(uri, user, pwd, dbname, translate_in):
+ uid = login(uri, dbname, user, pwd)
+ if uid:
+ conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+ wiz_id = execute(conn,'create',dbname, uid, pwd, 'base.language.import')
+ for trans_in in translate_in:
+ lang,ext = os.path.splitext(trans_in.split('/')[-1])
+ state = 'init'
+ datas = {'form':{}}
+ while state!='end':
+ res = execute(conn,'execute',dbname, uid, pwd, wiz_id, datas, state, {})
+ if 'datas' in res:
+ datas['form'].update( res['datas'].get('form',{}) )
+ if res['type']=='form':
+ for field in res['fields'].keys():
+ datas['form'][field] = res['fields'][field].get('value', False)
+ state = res['state'][-1][0]
+ trans_obj = open(trans_in)
+ datas['form'].update({
+ 'name': lang,
+ 'code': lang,
+ 'data' : base64.encodestring(trans_obj.read())
+ })
+ trans_obj.close()
+ elif res['type']=='action':
+ state = res['state']
+
+
+def check_quality(uri, user, pwd, dbname, modules, quality_logs):
+ uid = login(uri, dbname, user, pwd)
+ quality_logs += 'quality-logs'
+ if uid:
+ conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+ final = {}
+ for module in modules:
+ qualityresult = {}
+ test_detail = {}
+ quality_result = execute(conn,'execute', dbname, uid, pwd,'module.quality.check','check_quality',module)
+ detail_html = ''
+ html = '''<html><body><a name="TOP"></a>'''
+ html +="<h1> Module: %s </h1>"%(quality_result['name'])
+ html += "<h2> Final score: %s</h2>"%(quality_result['final_score'])
+ html += "<div id='tabs'>"
+ html += "<ul>"
+ for x,y,detail in quality_result['check_detail_ids']:
+ test = detail.get('name')
+ msg = detail.get('message','')
+ score = round(float(detail.get('score',0)),2)
+ html += "<li><a href=\"#%s\">%s</a></li>"%(test.replace(' ','-'),test)
+ detail_html +='''<div id=\"%s\"><h3>%s (Score : %s)</h3><font color=red><h5>%s</h5></font>%s</div>'''%(test.replace(' ', '-'), test, score, msg, detail.get('detail', ''))
+ test_detail[test] = (score,msg,detail.get('detail',''))
+ html += "</ul>"
+ html += "%s"% detail_html
+ html += "</div></body></html>"
+ if not os.path.isdir(quality_logs):
+ os.mkdir(quality_logs)
+ fp = open('%s/%s.html'%(quality_logs,module),'wb')
+ fp.write(to_decode(html))
+ fp.close()
+ #final[quality_result['name']] = (quality_result['final_score'],html,test_detail)
+
+ #fp = open('quality_log.pck','wb')
+ #pck_obj = pickle.dump(final,fp)
+ #fp.close()
+ #print "LOG PATH%s"%(os.path.realpath('quality_log.pck'))
+ return True
+ else:
+ print 'Login Failed...'
+ clean()
+ sys.exit(1)
+
+
+
+def wait(id,url=''):
+ progress=0.0
+ sock2 = xmlrpclib.ServerProxy(url+'/xmlrpc/db')
+ while not progress==1.0:
+ progress,users = execute(sock2,'get_progress',admin_passwd, id)
+ return True
+
+
+def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
+ conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db')
+ obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+ wiz_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+ login_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/common')
+ db_list = execute(conn, 'list')
+ if dbname in db_list:
+ drop_db(uri, dbname)
+ id = execute(conn,'create',admin_passwd, dbname, True, lang)
+ wait(id,uri)
+ install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
+ return True
+
+def drop_db(uri, dbname):
+ conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/db')
+ db_list = execute(conn,'list')
+ if dbname in db_list:
+ execute(conn, 'drop', admin_passwd, dbname)
+ return True
+
+def make_links(uri, uid, dbname, source, destination, module, user, pwd):
+ if module in ('base','quality_integration_server'):
+ return True
+ if os.path.islink(destination + '/' + module):
+ os.unlink(destination + '/' + module)
+ for path in source:
+ if os.path.isdir(path + '/' + module):
+ os.symlink(path + '/' + module, destination + '/' + module)
+ obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+ execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'update_list')
+ module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','=',module)])
+ if len(module_ids):
+ data = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'read', module_ids[0],['name','dependencies_id'])
+ dep_datas = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module.dependency', 'read', data['dependencies_id'],['name'])
+ for dep_data in dep_datas:
+ make_links(uri, uid, dbname, source, destination, dep_data['name'], user, pwd)
+ return False
+
+def install_module(uri, dbname, modules, addons='', extra_addons='', user='admin', pwd='admin'):
+ uid = login(uri, dbname, user, pwd)
+ if extra_addons:
+ extra_addons = extra_addons.split(',')
+ if uid:
+ if addons and extra_addons:
+ for module in modules:
+ make_links(uri, uid, dbname, extra_addons, addons, module, user, pwd)
+
+ obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+ wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+ module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
+ execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_install', module_ids)
+ wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
+ state = 'init'
+ datas = {}
+ #while state!='menu':
+ while state!='end':
+ res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+ if state == 'init':
+ state = 'start'
+ elif state == 'start':
+ state = 'end'
+ return True
+
+def upgrade_module(uri, dbname, modules, user='admin', pwd='admin'):
+ uid = login(uri, dbname, user, pwd)
+ if uid:
+ obj_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/object')
+ wizard_conn = xmlrpclib.ServerProxy(uri + '/xmlrpc/wizard')
+ module_ids = execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'search', [('name','in',modules)])
+ execute(obj_conn, 'execute', dbname, uid, pwd, 'ir.module.module', 'button_upgrade', module_ids)
+ wiz_id = execute(wizard_conn, 'create', dbname, uid, pwd, 'module.upgrade.simple')
+ state = 'init'
+ datas = {}
+ #while state!='menu':
+ while state!='end':
+ res = execute(wizard_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+ if state == 'init':
+ state = 'start'
+ elif state == 'start':
+ state = 'end'
+
+ return True
+
+
+
+
+
+usage = """%prog command [options]
+
+Basic Commands:
+ start-server Start Server
+ create-db Create new database
+ drop-db Drop database
+ install-module Install module
+ upgrade-module Upgrade module
+ install-translation Install translation file
+ check-quality Calculate quality and dump quality result into quality_log.pck using pickle
+"""
+parser = optparse.OptionParser(usage)
+parser.add_option("--modules", dest="modules",
+ help="specify modules to install or check quality")
+parser.add_option("--addons-path", dest="addons_path", help="specify the addons path")
+parser.add_option("--quality-logs", dest="quality_logs", help="specify the path of quality logs files which has to stores")
+parser.add_option("--root-path", dest="root_path", help="specify the root path")
+parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int")
+parser.add_option("--net_port", dest="netport",help="specify the TCP port for netrpc")
+parser.add_option("-d", "--database", dest="db_name", help="specify the database name")
+parser.add_option("--login", dest="login", help="specify the User Login")
+parser.add_option("--password", dest="pwd", help="specify the User Password")
+parser.add_option("--translate-in", dest="translate_in",
+ help="specify .po files to import translation terms")
+parser.add_option("--extra-addons", dest="extra_addons",
+ help="specify extra_addons and trunkCommunity modules path ")
+
+(opt, args) = parser.parse_args()
+if len(args) != 1:
+ parser.error("incorrect number of arguments")
+command = args[0]
+if command not in ('start-server','create-db','drop-db','install-module','upgrade-module','check-quality','install-translation'):
+ parser.error("incorrect command")
+
+def die(cond, msg):
+ if cond:
+ print msg
+ sys.exit(1)
+
+die(opt.modules and (not opt.db_name),
+ "the modules option cannot be used without the database (-d) option")
+
+die(opt.translate_in and (not opt.db_name),
+ "the translate-in option cannot be used without the database (-d) option")
+
+options = {
+ 'addons-path' : opt.addons_path or 'addons',
+ 'quality-logs' : opt.quality_logs or '',
+ 'root-path' : opt.root_path or '',
+ 'translate-in': [],
+ 'port' : opt.port or 8069,
+ 'netport':opt.netport or 8070,
+ 'database': opt.db_name or 'terp',
+ 'modules' : map(string.strip, opt.modules.split(',')) if opt.modules else [],
+ 'login' : opt.login or 'admin',
+ 'pwd' : opt.pwd or '',
+ 'extra-addons':opt.extra_addons or []
+}
+# Hint:i18n-import=purchase:ar_AR.po+sale:fr_FR.po,nl_BE.po
+if opt.translate_in:
+ translate = opt.translate_in
+ for module_name,po_files in map(lambda x:tuple(x.split(':')),translate.split('+')):
+ for po_file in po_files.split(','):
+ if module_name == 'base':
+ po_link = '%saddons/%s/i18n/%s'%(options['root-path'],module_name,po_file)
+ else:
+ po_link = '%s/%s/i18n/%s'%(options['addons-path'], module_name, po_file)
+ options['translate-in'].append(po_link)
+
+uri = 'http://localhost:' + str(options['port'])
+
+server_thread = threading.Thread(target=start_server,
+ args=(options['root-path'], options['port'],options['netport'], options['addons-path']))
+try:
+ server_thread.start()
+ if command == 'create-db':
+ create_db(uri, options['database'], options['login'], options['pwd'])
+ if command == 'drop-db':
+ drop_db(uri, options['database'])
+ if command == 'install-module':
+ install_module(uri, options['database'], options['modules'],options['addons-path'],options['extra-addons'],options['login'], options['pwd'])
+ if command == 'upgrade-module':
+ upgrade_module(uri, options['database'], options['modules'], options['login'], options['pwd'])
+ if command == 'check-quality':
+ check_quality(uri, options['login'], options['pwd'], options['database'], options['modules'], options['quality-logs'])
+ if command == 'install-translation':
+ import_translate(uri, options['login'], options['pwd'], options['database'], options['translate-in'])
+ clean()
+ sys.exit(0)
+
+except xmlrpclib.Fault, e:
+ print e.faultString
+ clean()
+ sys.exit(1)
+except Exception, e:
+ print e
+ clean()
+ sys.exit(1)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/cli/server.py'
--- openerp/cli/server.py 2013-05-06 10:30:54 +0000
+++ openerp/cli/server.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
=== modified file 'openerp/netsvc.py'
--- openerp/netsvc.py 2013-04-04 13:07:04 +0000
+++ openerp/netsvc.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
@@ -102,7 +101,7 @@
if os.name == 'nt':
handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
else:
- handler = logging.handlers.SysLogHandler('/dev/log')
+ handler = logging.handlers.SysLogHandler('/dev/log', facility=tools.config['syslog_facility'])
format = '%s %s' % (release.description, release.version) \
+ ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py 2013-04-23 18:37:23 +0000
+++ openerp/osv/expression.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
=== modified file 'openerp/report/render/rml2html/rml2html.py'
--- openerp/report/render/rml2html/rml2html.py 2013-04-22 17:04:20 +0000
+++ openerp/report/render/rml2html/rml2html.py 2013-05-31 16:31:27 +0000
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
=== modified file 'openerp/report/render/rml2html/utils.py'
--- openerp/report/render/rml2html/utils.py 2013-04-22 17:04:20 +0000
+++ openerp/report/render/rml2html/utils.py 2013-05-31 16:31:27 +0000
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
=== modified file 'openerp/report/render/rml2pdf/customfonts.py'
--- openerp/report/render/rml2pdf/customfonts.py 2013-02-12 14:24:10 +0000
+++ openerp/report/render/rml2pdf/customfonts.py 2013-05-31 16:31:27 +0000
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 P. Christeas, Tiny SPRL (<http://tiny.be>).
-# Copyright (C) 2010 OpenERP SA. (http://www.openerp.com)
+# Copyright (C) 2010-2013 OpenERP SA. (http://www.openerp.com)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -56,7 +56,11 @@
('Courier',"FreeMono", "FreeMono.ttf", 'normal'),
('Courier',"FreeMono Bold", "FreeMonoBold.ttf", 'bold'),
('Courier',"FreeMono Oblique", "FreeMonoOblique.ttf", 'italic'),
- ('Courier',"FreeMono BoldOblique", "FreeMonoBoldOblique.ttf", 'bolditalic'),]
+ ('Courier',"FreeMono BoldOblique", "FreeMonoBoldOblique.ttf", 'bolditalic'),
+
+ # Sun-ExtA can be downloaded from http://okuc.net/SunWb/
+ ('Sun-ExtA',"Sun-ExtA", "Sun-ExtA.ttf", 'normal'),
+]
TTFSearchPath_Linux = [
=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py 2013-04-08 13:25:10 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py 2013-05-31 16:31:27 +0000
@@ -160,9 +160,11 @@
for style in node.findall('paraStyle'):
sname = style.get('name')
self.styles[sname] = self._para_style_update(style)
-
- self.styles_obj[sname] = reportlab.lib.styles.ParagraphStyle(sname, self.default_style["Normal"], **self.styles[sname])
-
+ if sname in self.default_style:
+ for key, value in self.styles[sname].items():
+ setattr(self.default_style[sname], key, value)
+ else:
+ self.styles_obj[sname] = reportlab.lib.styles.ParagraphStyle(sname, self.default_style["Normal"], **self.styles[sname])
for variable in node.findall('initialize'):
for name in variable.findall('name'):
self.names[ name.get('id')] = name.get('value')
@@ -269,16 +271,30 @@
from reportlab.pdfbase.ttfonts import TTFont
for node in els:
+
for font in node.findall('registerFont'):
name = font.get('fontName').encode('ascii')
fname = font.get('fontFile').encode('ascii')
if name not in pdfmetrics._fonts:
pdfmetrics.registerFont(TTFont(name, fname))
+ #by default, we map the fontName to each style (bold, italic, bold and italic), so that
+ #if there isn't any font defined for one of these style (via a font family), the system
+ #will fallback on the normal font.
addMapping(name, 0, 0, name) #normal
addMapping(name, 0, 1, name) #italic
addMapping(name, 1, 0, name) #bold
addMapping(name, 1, 1, name) #italic and bold
+ #if registerFontFamily is defined, we register the mapping of the fontName to use for each style.
+ for font_family in node.findall('registerFontFamily'):
+ family_name = font_family.get('normal').encode('ascii')
+ if font_family.get('italic'):
+ addMapping(family_name, 0, 1, font_family.get('italic').encode('ascii'))
+ if font_family.get('bold'):
+ addMapping(family_name, 1, 0, font_family.get('bold').encode('ascii'))
+ if font_family.get('boldItalic'):
+ addMapping(family_name, 1, 1, font_family.get('boldItalic').encode('ascii'))
+
def setTTFontMapping(self,face, fontname, filename, mode='all'):
from reportlab.lib.fonts import addMapping
from reportlab.pdfbase import pdfmetrics
=== modified file 'openerp/report/render/rml2pdf/utils.py'
--- openerp/report/render/rml2pdf/utils.py 2013-05-06 13:28:23 +0000
+++ openerp/report/render/rml2pdf/utils.py 2013-05-31 16:31:27 +0000
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
=== modified file 'openerp/service/cron.py'
--- openerp/service/cron.py 2013-04-04 13:07:04 +0000
+++ openerp/service/cron.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
=== modified file 'openerp/service/http_server.py'
--- openerp/service/http_server.py 2013-02-12 14:24:10 +0000
+++ openerp/service/http_server.py 2013-05-31 16:31:27 +0000
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
=== modified file 'openerp/service/websrv_lib.py'
--- openerp/service/websrv_lib.py 2013-02-12 14:24:10 +0000
+++ openerp/service/websrv_lib.py 2013-05-31 16:31:27 +0000
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
=== modified file 'openerp/tests/test_mail.py' (properties changed: -x to +x)
=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py 2013-03-28 09:50:06 +0000
+++ openerp/tools/config.py 2013-05-31 16:31:27 +0000
@@ -172,6 +172,7 @@
group.add_option("--logfile", dest="logfile", help="file where the server log will be stored")
group.add_option("--logrotate", dest="logrotate", action="store_true", my_default=False, help="enable logfile rotation")
group.add_option("--syslog", action="store_true", dest="syslog", my_default=False, help="Send the log to the syslog server")
+ group.add_option("--syslog-facility", dest="syslog_facility", my_default="user", help="Set the facility for outgoing syslog messages")
group.add_option('--log-handler', action="append", default=DEFAULT_LOG_HANDLER, my_default=DEFAULT_LOG_HANDLER, metavar="PREFIX:LEVEL", help='setup a handler at LEVEL for a given PREFIX. An empty PREFIX indicates the root logger. This option can be repeated. Example: "openerp.orm:DEBUG" or "werkzeug:CRITICAL" (default: ":INFO")')
group.add_option('--log-request', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.request:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.request:DEBUG')
group.add_option('--log-response', action="append_const", dest="log_handler", const="openerp.netsvc.rpc.response:DEBUG", help='shortcut for --log-handler=openerp.netsvc.rpc.response:DEBUG')
@@ -366,6 +367,20 @@
if self.options['pidfile'] in ('None', 'False'):
self.options['pidfile'] = False
+ # convert facility name to number
+ if self.options['syslog']:
+ facility = self.options['syslog_facility'].lower()
+ if facility.isdigit():
+ facility = int(facility)
+ else:
+ import logging.handlers
+ facility = logging.handlers.SysLogHandler.facility_names.get(facility, -1)
+
+ die(facility not in range(24), "unknown syslog facility: '%s'" %
+ self.options['syslog_facility'])
+
+ self.options['syslog_facility'] = facility
+
# if defined dont take the configfile value even if the defined value is None
keys = ['xmlrpc_interface', 'xmlrpc_port', 'longpolling_port',
'db_name', 'db_user', 'db_password', 'db_host',
@@ -395,8 +410,13 @@
keys = [
'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
'debug_mode', 'smtp_ssl', 'load_language',
+<<<<<<< TREE
'stop_after_init', 'logrotate', 'without_demo', 'xmlrpc', 'syslog',
'list_db', 'xmlrpcs', 'proxy_mode',
+=======
+ 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
+ 'syslog_facility', 'list_db', 'xmlrpcs', 'proxy_mode',
+>>>>>>> MERGE-SOURCE
'test_file', 'test_enable', 'test_commit', 'test_report_directory',
'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request', 'gevent'
=== modified file 'setup.nsi'
--- setup.nsi 2013-03-06 14:34:44 +0000
+++ setup.nsi 2013-05-31 16:31:27 +0000
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#####################################################################################
!include 'MUI2.nsh'
=== modified file 'setup.py' (properties changed: +x to -x)
--- setup.py 2013-05-06 07:48:25 +0000
+++ setup.py 2013-05-31 16:31:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
Follow ups
