merge

bzr revid: fp@tinyerp.com-20090422070231-qezefyvhz8661w7x
2009-04-22 09:02:31 +02:00 · 2009-04-22 09:02:31 +02:00 · 7092fe3ef9
parent d8709d9219 1b96a0b706
commit 7092fe3ef9
5 changed files with 37 additions and 11 deletions
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@ -273,8 +273,8 @@ class crm_case_rule(osv.osv):

    def _check(self, cr, uid, ids=False, context={}):
        '''
-        Function called by the sceduler to proccess cases for date actions
-        Only works on not done and canceled cases
+        Function called by the scheduler to process cases for date actions
+        Only works on not done and cancelled cases
        '''
        cr.execute('select * from crm_case \
                where (date_action_last<%s or date_action_last is null) \
--- a/addons/document/ftpserver/init.py
+++ b/addons/document/ftpserver/init.py
@ -27,8 +27,12 @@ import abstracted_fs
 import netsvc

 from tools import config
-PORT = int(config.get('ftp_server_port', 8021))
 HOST = ''
+PORT = int(config.get('ftp_server_port', 8021))
+PASSIVE_PORTS = None
+pps = config.get('ftp_server_passive_ports', '').split(':')
+if len(pps) == 2:
+    PASSIVE_PORTS = int(pps[0]), int(pps[1])

 class ftp_server(threading.Thread):
    def log(self, level, message):        
@ -41,6 +45,8 @@ class ftp_server(threading.Thread):
        ftpserver.max_cons = 300
        ftpserver.max_cons_per_ip = 50
        ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
+        if PASSIVE_PORTS:
+            ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
        
        ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
        ftpserver.logline = lambda msg: None
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@ -15,6 +15,7 @@
        <!-- Balance Sheet -->

        <record id="bal" model="account.account.template">
+        	<field name="code">1</field>
            <field name="name">Balance Sheet</field>
            <field ref="chart0" name="parent_id"/>
            <field name="type">view</field>
@ -22,6 +23,7 @@
        </record>

        <record id="fas" model="account.account.template">
+        	<field name="code">10</field>
            <field name="name">Fixed Assets</field>
            <field ref="bal" name="parent_id"/>
            <field name="type">view</field>
@ -29,6 +31,7 @@
        </record>

        <record id="xfa" model="account.account.template">
+        	<field name="code">100</field>
            <field name="name">Fixed Asset Account</field>
            <field ref="fas" name="parent_id"/>
            <field name="type">other</field>
@ -36,6 +39,7 @@
        </record>

        <record id="nca" model="account.account.template">
+        	<field name="code">11</field>
            <field name="name">Net Current Assets</field>
            <field ref="bal" name="parent_id"/>
            <field name="type">view</field>
@ -43,6 +47,7 @@
        </record>

        <record id="cas" model="account.account.template">
+        	<field name="code">110</field>
            <field name="name">Current Assets</field>
 	        <field ref="nca" name="parent_id"/>
            <field name="type">view</field>
@ -50,7 +55,7 @@
        </record>

        <record id="stk" model="account.account.template">
-            <field name="code"/>
+            <field name="code">1101</field>
            <field name="name">Purchased Stocks</field>
            <field ref="cas" name="parent_id"/>
            <field name="type">other</field>
@ -58,7 +63,7 @@
        </record>

        <record id="a_recv" model="account.account.template">
-            <field name="code"/>
+            <field name="code">1102</field>
            <field name="name">Debtors</field>
            <field ref="cas" name="parent_id"/>
            <field name="type">receivable</field>
@ -71,6 +76,7 @@
        </record> -->

        <record id="ova" model="account.account.template">
+        	<field name="code">1103</field>
            <field name="name">Output VAT</field>
            <field ref="cas" name="parent_id"/>
            <field name="type">other</field>
@ -78,6 +84,7 @@
        </record>

        <record id="bnk" model="account.account.template">
+        	<field name="code">1104</field>
            <field name="name">Bank Current Account</field>
            <field ref="cas" name="parent_id"/>
            <field name="type">other</field>
@ -85,7 +92,7 @@
        </record>

        <record id="cash" model="account.account.template">
-            <field name="code"/>
+            <field name="code">1105</field>
            <field name="name">Cash</field>
            <field ref="cas" name="parent_id"/>
            <field name="type">other</field>
@ -93,6 +100,7 @@
        </record>

        <record id="cli" model="account.account.template">
+        	<field name="code">111</field>
            <field name="name">Current Liabilities</field>
            <field ref="nca" name="parent_id"/>
            <field name="type">view</field>
@ -100,7 +108,7 @@
        </record>

        <record id="a_pay" model="account.account.template">
-            <field name="code"/>
+            <field name="code">1111</field>
            <field name="name">Creditors</field>
            <field ref="cli" name="parent_id"/>
            <field name="type">payable</field>
@ -113,6 +121,7 @@
        </record>-->

        <record id="iva" model="account.account.template">
+        	<field name="code">1112</field>
            <field name="name">Input VAT</field>
            <field ref="cli" name="parent_id"/>
            <field name="type">other</field>
@ -122,6 +131,7 @@
        <!-- Profit and Loss -->

        <record id="gpf" model="account.account.template">
+        	<field name="code">2</field>
            <field name="name">Profit and Loss</field>
            <field ref="chart0" name="parent_id"/>
            <field name="type">view</field>
@ -129,6 +139,7 @@
        </record>

        <record id="rev" model="account.account.template">
+			<field name="code">20</field>        
            <field name="name">Revenue</field>
            <field ref="gpf" name="parent_id"/>
            <field name="type">view</field>
@ -136,7 +147,7 @@
        </record>

        <record id="a_sale" model="account.account.template">
-            <field name="code"/>
+            <field name="code">200</field>
            <field name="name">Product Sales</field>
            <field ref="rev" name="parent_id"/>
            <field name="type">other</field>
@ -148,6 +159,7 @@
        </record> -->

        <record id="cos" model="account.account.template">
+        	<field name="code">21</field>
            <field name="name">Cost of Sales</field>
            <field ref="gpf" name="parent_id"/>
            <field name="type">view</field>
@ -155,7 +167,7 @@
        </record>

        <record id="cog" model="account.account.template">
-            <field name="code"/>
+            <field name="code">210</field>
            <field name="name">Cost of Goods Sold</field>
            <field ref="cos" name="parent_id"/>
            <field name="type">other</field>
@ -163,6 +175,7 @@
        </record>

        <record id="ovr" model="account.account.template">
+        	<field name="code">22</field>
            <field name="name">Overheads</field>
            <field ref="gpf" name="parent_id"/>
            <field name="type">view</field>
@ -170,7 +183,7 @@
        </record>

        <record id="a_expense" model="account.account.template">
-            <field name="code"/>
+            <field name="code">220</field>
            <field name="name">Expenses</field>
            <field ref="ovr" name="parent_id"/>
            <field name="type">other</field>
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@ -46,6 +46,12 @@ class stock_picking(osv.osv):
    _defaults = {
        'purchase_id': lambda *a: False,
    }
+    
+    def get_currency_id(self, cursor, user, picking):
+        if picking.purchase_id:
+            return picking.purchase_id.pricelist_id.currency_id.id
+        else:
+            return super(stock_picking, self).get_currency_id(cursor, user, picking)

    def _get_comment_invoice(self, cursor, user, picking):
        if picking.purchase_id and picking.purchase_id.notes:
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@ -44,7 +44,8 @@ class stock_picking(osv.osv):
    def get_currency_id(self, cursor, user, picking):
        if picking.sale_id:
            return picking.sale_id.pricelist_id.currency_id.id
-        return False
+        else:
+            return super(stock_picking, self).get_currency_id(cursor, user, picking)

    def _get_payment_term(self, cursor, user, picking):
        res = {}