improvement

bzr revid: fp@tinyerp.com-20081013163022-d8ddflvsdp9gjydf

addons/account/account.py

@@ -844,7 +844,7 @@ class account_move(osv.osv):
 
                 if line.account_id.currency_id:
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
-                            raise osv.except_osv(_('Error'), _('Couldn\'t create move with currency different than the secondary currency of the account'))
+                            raise osv.except_osv(_('Error'), _('Couldn\'t create move with currency different than the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.' % (line.account_id.code, line.account_id.name)))
 
             if abs(amount) < 0.0001:
                 if not len(line_draft_ids):
@@ -1859,9 +1859,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal = self.pool.get('account.journal')
         obj_acc_template = self.pool.get('account.account.template')
 
-        if obj_multi.code_digits<=5:
-            raise osv.except_osv(_('User Error'), _('Account code should be of more than 5 digits.'))
-
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -1943,7 +1940,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
                 #'sign': account_template.sign,
                 'currency_id': account_template.currency_id and account_template.currency_id.id or False,
-                'code': code_acc[:dig],
+                'code': code_acc,
                 'type': account_template.type,
                 'user_type': account_template.user_type and account_template.user_type.id or False,
                 'reconcile': account_template.reconcile,

addons/delivery/delivery_view.xml

@@ -62,7 +62,7 @@
                     <field name="active" select="1"/>
                     <field name="carrier_id" select="1"/>
                     <field name="sequence" select="1"/>
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="Grid definition">
                             <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>

addons/product/product.py

@@ -531,6 +531,7 @@ class product_packaging(osv.osv):
     _description = "Packaging"
     _rec_name = 'ean'
     _columns = {
+        'sequence': fields.integer('Sequence'),
         'name' : fields.char('Description', size=64),
         'qty' : fields.float('Quantity by Package',
             help="The total number of products you can put by palet or box."),
@@ -559,6 +560,7 @@ class product_packaging(osv.osv):
 
     _defaults = {
         'rows' : lambda *a : 3,
+        'sequence' : lambda *a : 1,
         'ul' : _get_1st_ul,
     }
 

addons/product/product_view.xml

@@ -121,6 +121,7 @@
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
                                     <field name="ean" select="1"/>
+                                    <field name="sequence"/>
                                     <newline/>
                                     <field name="qty" select="1"/>
                                     <field name="ul"/>
@@ -322,6 +323,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
+                    <field name="sequence"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -336,7 +338,9 @@
             <field name="arch" type="xml">
                 <form string="Packaging">
                     <field name="product_id" select="1"/>
+                    <newline/>
                     <field name="ean" select="1"/>
+                    <field name="sequence"/>
                     <newline/>
                     <field name="qty" select="1"/>
                     <field name="ul"/>

addons/sale/sale_report.xml

@@ -23,7 +23,7 @@
 		rml="sale/report/prepare_allot.rml"
 		auto="False"/>
 	-->
-        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Print Order"/>
-        
+        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Quotation / Order"/>
+
     </data>
 </openerp>