Merge lp:~openbig/bigconsulting/milestone_changes into lp:bigconsulting

[gpa(OpenERP)]

Added changes as milestone1

=== modified file 'account_invoice_cash_discount/__init__.py'
--- account_invoice_cash_discount/__init__.py	2010-05-26 13:32:15 +0000
+++ account_invoice_cash_discount/__init__.py	2010-06-29 13:29:23 +0000
@@ -20,7 +20,8 @@
 #
 ##############################################################################
 
+import wizard
 import account_invoice_cash_discount
-import wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/__terp__.py'
--- account_invoice_cash_discount/__terp__.py	2010-06-24 10:49:42 +0000
+++ account_invoice_cash_discount/__terp__.py	2010-06-29 13:29:23 +0000
@@ -34,7 +34,11 @@
     "demo_xml" : [
     ],
     "update_xml" : [
+<<<<<<< TREE
         "security/ir.model.access.csv",
+=======
+        "account_invoice_cash_discount_wizard.xml",
+>>>>>>> MERGE-SOURCE
         "account_invoice_cash_discount_view.xml",
         'wizard/account_pay_invoice_view.xml',
     ],

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-17 13:38:00 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-29 13:29:23 +0000
@@ -175,7 +175,14 @@
         if invoice.type in ('in_invoice', 'in_refund'):
             ref = invoice.reference
         else:
-            ref = self._convert_ref(cr, uid, invoice.number)        
+            ref = self._convert_ref(cr, uid, invoice.number)
+        
+        discount_amount = 0.0
+        tax_total_amount = 0.0
+        
+        if 'cash_amount' in context and context['cash_amount']:
+            discount_amount = context['cash_amount']
+                
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * (pay_amount)>0 and direction * (pay_amount),
@@ -187,7 +194,11 @@
             'currency_id':currency_id,
             'amount_currency':amount_currency and direction * amount_currency or 0.0,
         }
-
+        
+        ### if we change the amount paid and in the disocunt  then it used the changes discount 
+        if amount_discount != discount_amount and discount_amount>0.0:
+            amount_discount = discount_amount
+            
         l2 = {
             'debit': direction * (pay_amount-amount_discount)<0 and - direction * (pay_amount-amount_discount),
             'credit': direction * (pay_amount-amount_discount)>0 and direction * (pay_amount-amount_discount),
@@ -201,74 +212,107 @@
 
         if not name:
             name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+            
         l1['name'] = name
         l2['name'] = name
         lines = [(0, 0, l1), (0, 0, l2)]
         
-        discount_amount = 0.0
-        tax_total_amount = 0.0
-        if 'cash_amount' in context and context['cash_amount']:
-            discount_amount = context['cash_amount']
-       
-        if discount_amount>0.0:         
-            for line in invoice.invoice_line:
-                if line.invoice_line_tax_id:
-                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, discount_amount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
-                        tax_amount = tax['amount']
-                        tax_total_amount += tax['amount']
-        
-                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
-                        for tax_id in tax_invoice_id:
-                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
-                            tax_account_id = tax_value.account_id.id
-
-                        l3 = {
-                            'debit': direction * tax_amount<0 and - direction * tax_amount,
-                            'credit': direction * tax_amount>0 and  direction * tax_amount,
-                            'account_id': tax_account_id,
-                            'partner_id': invoice.partner_id.id,
-                            'ref':ref,
-                            'date': date,
+        if 'tax_move_ids' in context and context['tax_move_ids']:
+            move_line = context['tax_move_ids']
+            for move_line_id in move_line:
+                move_line_data = self.pool.get('account.move.line').browse(cr, uid,move_line_id)
+                l3 = {
+                        'debit': move_line_data.debit,
+                        'credit': move_line_data.credit,
+                        'account_id': move_line_data.account_id.id,
+                        'partner_id': move_line_data.partner_id.id,
+                        'ref':move_line_data.ref,
+                        'date': move_line_data.date,
+                        'currency_id':currency_id,
+                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                        'name':move_line_data.name,
+                        'tax_code_id':move_line_data.tax_code_id.id,
+                        'tax_amount':move_line_data.tax_amount,
+                        }
+                lines.append((0, 0, l3))
+        else:
+            if amount_discount>0.0:         
+                for line in invoice.invoice_line:
+                    if line.invoice_line_tax_id:
+                        for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, amount_discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                            tax_amount = tax['amount']
+                            tax_total_amount += tax['amount']
+                            tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                            for tax_id in tax_invoice_id:
+                                tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                                tax_account_id = tax_value.account_id.id
+                            l3 = {
+                                'debit': direction * tax_amount<0 and - direction * tax_amount,
+                                'credit': direction * tax_amount>0 and  direction * tax_amount,
+                                'account_id': tax_account_id,
+                                'partner_id': invoice.partner_id.id,
+                                'ref':ref,
+                                'date': date,
+                                'currency_id':currency_id,
+                                'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                                'tax_code_id':tax_value.tax_code_id.id,
+                                'tax_amount':tax_amount,
+                            }
+                            l3['name'] = name
+                            lines.append((0, 0, l3))
+                    
+        if 'discount_move_ids' in context and context['discount_move_ids']: 
+            dis_move_id = context['discount_move_ids'][0]
+            move_id = self.pool.get('account.move.line').search(cr, uid,[('move_id','=',dis_move_id)])
+            move_line_data = self.pool.get('account.move.line').browse(cr, uid, move_id[0])
+            l4 = {
+                            'debit': move_line_data.debit,
+                            'credit':move_line_data.credit,
+                            'account_id': move_line_data.account_id.id,
+                            'partner_id': move_line_data.partner_id.id,
+                            'ref':move_line_data.ref,
+                            'date': move_line_data.date,
                             'currency_id':currency_id,
                             'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                            'name':move_line_data.name,
                         }
-                        l3['name'] = name
-                        lines.append((0, 0, l3))
-            
-        if amount_discount>0:
-            if 'account_id' in context and context['account_id']:
-                account_id = context['account_id']  
-            
-            if tax_total_amount>0:
-                amount_discount = (amount_discount - tax_total_amount)
-            else:
-                amount_discount = amount_discount
-                
-            l4 = {
-                'debit': direction * amount_discount<0 and - direction * amount_discount,
-                'credit': direction * amount_discount>0 and  direction * amount_discount,
-                'account_id': account_id,
-                'partner_id': invoice.partner_id.id,
-                'ref':ref,
-                'date': date,
-                'currency_id':currency_id,
-                'amount_currency':amount_currency and direction * amount_currency or 0.0,
-            }
-            l4['name'] = name
             lines.append((0, 0, l4))
+            
+        else:
+            if amount_discount>0:
+                if 'account_id' in context and context['account_id']:
+                    account_id = context['account_id']  
+                if tax_total_amount>0:
+                    amount_discount = (amount_discount - tax_total_amount)
+                else:
+                    amount_discount = amount_discount
+                l4 = {
+                    'debit': direction * amount_discount<0 and - direction * amount_discount,
+                    'credit': direction * amount_discount>0 and  direction * amount_discount,
+                    'account_id': account_id,
+                    'partner_id': invoice.partner_id.id,
+                    'ref':ref,
+                    'date': date,
+                    'currency_id':currency_id,
+                    'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                }
+                l4['name'] = name
+                lines.append((0, 0, l4))
 
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
-
+        
         line_ids = []
         total = 0.0
         line = self.pool.get('account.move.line')
         cr.execute('select id from account_move_line where move_id in ('+str(move_id)+','+str(invoice.move_id.id)+')')
+        
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
         for l in lines+invoice.payment_ids:
             if l.account_id.id==src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
+
         if (not round(total,int(config['price_accuracy']))) or writeoff_acc_id:
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-06-01 05:48:55 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-06-29 13:29:23 +0000
@@ -45,5 +45,45 @@
             </field>
         </record>
 
+		<record id="bank_statement_form_view1" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//button[@string='Import Invoice']" position="replace">
+                        <button name="%(wizard_populate_statement_from_inv1)d"  type="action" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}"/>
+            	</xpath>        
+            </field>
+        </record>
+		
+		<record id="bank_statement_reconcile_form_view1" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
+            <field name="arch" type="xml">
+            	<field name="total_new" position="replace">
+					<field name="total_new" string="Total Write Off / Cash Discount"/>
+				</field>      
+            </field>
+        </record>
+        
+        <record id="bank_statement_reconcile_form_view2" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//tree[@string='Write-Off']" position="replace">
+					<tree editable="bottom" string="Write-Off and Cash-Discount">
+                            <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="amount"/>
+                            <field name="name"/>
+                        </tree>
+				</xpath>    
+            </field>
+        </record>
+		
     </data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/__init__.py'
--- account_invoice_cash_discount/wizard/__init__.py	2010-06-01 05:48:55 +0000
+++ account_invoice_cash_discount/wizard/__init__.py	2010-06-29 13:29:23 +0000
@@ -21,6 +21,7 @@
 ##############################################################################
 
 import account_pay_invoice
+import invoice_statement_payment
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-08-17 13:38:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-06-29 13:29:23 +0000
@@ -58,18 +58,18 @@
         'amount': fields.float('Amount paid', required=True),
         'name': fields.char('Entry Name', size=64, required=True),
         'date': fields.date('Date payment', required=True),
+        'cash_residual_amount': fields.float('Residual Amount', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
         'period_id': fields.many2one('account.period', 'Period', required=True),
         'cash_amount':fields.float('Cash Discount Amount',),
         'account_id': fields.many2one('account.account', 'Account For Discount',),
+        'cal_method_selection': fields.selection([('method_gross_methodology','Calculate Discount with Net Gross Methodology'),
+                                            ('method_net_methodology','Calculate Discount with Net Methodology'),],
+                                              'Method To Calculation'),
+        'discount_move_ids': fields.many2many('account.move', 'account_discount_move_rel', 'discount_account_id', 'discount_move_id', 'Account Discount Moves'),
+        'tax_move_ids': fields.many2many('account.move.line', 'account_tax_move_rel', 'tax_account_id', 'tax_move_id', 'Account Taxes Moves'),
         }
 
-    def view_init(self, cr, uid, ids, context=None):
-        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
-        if invoice.state in ['draft', 'proforma2', 'cancel']:
-            raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
-        pass
-
     def _get_period(self, cr, uid, context=None):
         ids = self.pool.get('account.period').find(cr, uid, context=context)
         period_id = False
@@ -78,7 +78,10 @@
         return period_id
 
     def _get_amount(self, cr, uid, context=None):
-        residual_amount = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context).residual
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        discount = obj_inv._get_payment(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
+        residual_amount = invoice.residual - discount
         return residual_amount
     
     def on_change_ammount(self, cr, uid, ids, amount, context=None):
@@ -88,8 +91,18 @@
         res = {}
         obj_inv = self.pool.get('account.invoice')
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
-        discount = obj_inv._get_payment(cr, uid, [context['id']] , amount, invoice.payment_term.id, context=context)
-        return {'value' : {'cash_amount':discount}}
+        discount = obj_inv._get_payment(cr, uid, [context['id']] , invoice.residual, invoice.payment_term.id, context=context)
+        diff_amount = round(invoice.residual -  (amount + discount),2)
+        return {'value' : {'cash_residual_amount':diff_amount}}
+    
+    def on_change_cash_discount_amount(self, cr, uid, ids, discount_amount, amount, context=None):
+        ###  Return discount amount
+        res = {}
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        diff_amount = 0.0
+        diff_amount = round(invoice.residual -  (amount + discount_amount),2)
+        return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
     
     def _get_discount(self, cr, uid, context=None):
         obj_inv = self.pool.get('account.invoice')
@@ -116,12 +129,89 @@
           raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
       return res
   
+    def _calculation(self, cr, uid, ids, context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        data =  self.read(cr, uid, ids,context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        tax_obj = self.pool.get('account.tax')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+
+        ######## to get ref
+        if invoice.type in ('in_invoice', 'in_refund'):
+            ref = invoice.reference
+        else:
+            ref = invoice_obj._convert_ref(cr, uid, invoice.number)        
+        
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date=time.strftime('%Y-%m-%d')
+        
+        #### to get name
+        name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
+        
+        ##### Entry in the discount account moves and entry in the tax account moves
+        
+        ### Entry for taxes in the line of wizard tax
+        if data.get('cash_amount',0.0)>0.0:
+            lines3 = []
+            tax_total_amount = 0.0    
+            line_ids = []     
+            for line in invoice.invoice_line:
+                if line.invoice_line_tax_id:
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, data['cash_amount'], line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                        tax_amount = tax['amount']
+                        tax_total_amount += tax['amount']
+                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                        for tax_id in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                            tax_account_id = tax_value.account_id.id
+                        l3 = {
+                            'debit': direction * tax_amount<0 and - direction * tax_amount,
+                            'credit': direction * tax_amount>0 and  direction * tax_amount,
+                            'account_id': tax_account_id,
+                            'partner_id': invoice.partner_id.id,
+                            'ref':ref,
+                            'date': date,
+                            'journal_id':data.get('journal_id',False) ,
+                            'period_id':data.get('period_id',False),
+                            'name':name,
+                            'tax_code_id':tax_value.tax_code_id.id,
+                            'tax_amount':tax_amount,
+                        }
+                        line_id = self.pool.get('account.move.line').create(cr,uid,l3,context=context)
+                        line_ids.append(line_id)
+            self.write(cr, uid, ids, {'tax_move_ids':[(6,0,line_ids)]}, context)
+
+            ### Entry for discount in the line of wizard discount
+            lines4 = []
+            if tax_total_amount>0:
+                data['cash_amount'] = (data['cash_amount'] - tax_total_amount)
+                    
+            l4 = {
+                'debit': direction * data.get('cash_amount',0.0)<0 and - direction * data.get('cash_amount',0.0),
+                'credit': direction * data.get('cash_amount',0.0)>0 and  direction * data.get('cash_amount',0.0),
+                'account_id': data['account_id'],
+                'partner_id': invoice.partner_id.id,
+                'ref':ref,
+                'date': date,
+                'name':name
+                }
+            
+            lines4.append((0, 0, l4))    
+            move = {'ref': ref, 'line_id': lines4, 'journal_id': data['journal_id'], 'period_id': data['period_id'], }
+            move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
+            self.write(cr, uid, ids, {'discount_move_ids':[(6,0,[move_id])]}, context)
+        return True
+    
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'period_id': _get_period,
         'amount': _get_amount,
         'cash_amount':_get_discount,
-        'account_id':_get_account
+        'account_id':_get_account,
+        'cash_residual_amount': lambda *a:0.0,
+        'cal_method_selection':lambda *a :'method_gross_methodology',
         }
 
     def wo_check(self, cr, uid, ids, context=None):
@@ -186,13 +276,13 @@
         writeoff_account_id = False
         writeoff_journal_id = False
         comment = False
-
+        
         if 'write_off' in context and context['write_off'] :
             writeoff_account_id = context['write_off']['writeoff_acc_id']
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
 
-        amount = data['amount'] 
+        amount = data['amount'] + data['cash_amount']
         
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
         journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context)
@@ -203,14 +293,14 @@
             amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = journal.currency.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
+            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
 
         if invoice.company_id.currency_id.id<>invoice.currency_id.id:
             ctx = {'date':data['date']}
             amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = invoice.currency_id.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
+            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
 
         # Take the choosen date
         if comment:
@@ -218,8 +308,17 @@
         else:
             context.update({'date_p':data['date'],'comment':False})
 
-        context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount']})        
-        
+        context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount'] + data['cash_amount']})        
+        
+        if data['discount_move_ids']:
+            context.update({'discount_move_ids':data['discount_move_ids']})
+        
+        if data['tax_move_ids']:
+            context.update({'tax_move_ids':data['tax_move_ids']})
+        
+        if data['cash_amount']:
+            context.update({'cash_amount':data['cash_amount']})
+                
         acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
         if not acc_id:
             raise osv.except_osv(_('Error !'), _('Your journal must have a default credit and debit account.'))

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-08-17 13:38:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-29 13:29:23 +0000
@@ -9,14 +9,27 @@
                 <form string="Pay invoice">
                 	<group colspan="4" >
 						<field name="amount" on_change="on_change_ammount(amount,context)"/>
-					    <newline/>
+					    <field name="cash_residual_amount"/>
 					    <field name="name"/>
 					    <field name="date"/>
 					    <field name="journal_id" domain="[('type','=','cash')]"/>
 					    <field name="period_id"/>
-					    <field name="cash_amount" attrs="{'required':[('cash_amount','>',0)]}"/>
+					    <field name="cash_amount" on_change="on_change_cash_discount_amount(cash_amount,amount,context)" attrs="{'required':[('cash_amount','>',0)]}"/>
 					    <field name="account_id" attrs="{'required':[('cash_amount','>',0)]}"/>
                 	</group>
+                	<group>
+                		<separator string="Method For Calculation" colspan="4"/>
+                		<field name="cal_method_selection" colspan="4" nolabel="1"/>
+                		<button icon="gtk-execute" string="Calculate" name="_calculation" type="object"/>
+                	</group>
+                	<group colspan="4">
+                		<separator string="Account Discount Moves" colspan="4"/>
+                		<field name="discount_move_ids" widget="one2many_list" nolabel="1"/>
+                	</group>
+                	<group colspan="4">
+                		<separator string="Account Taxes Moves" colspan="4"/>
+                		<field name="tax_move_ids" widget="one2many_list" nolabel="1"/>
+                	</group>
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>

=== modified file 'packing_barcode_check/report/bar_code_check.rml'
--- packing_barcode_check/report/bar_code_check.rml	2010-06-24 12:19:20 +0000
+++ packing_barcode_check/report/bar_code_check.rml	2010-06-29 13:29:23 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(320.0,210.0)" rightMargin="0.0cm" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(235.0,210.0)" rightMargin="0.0cm" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="1.5cm" y1="0.0cm" width="320.0" height="210"/>
+      <frame id="first" x1="65.0" y1="0.0" width="235.0" height="210"/>
     </pageTemplate>
   </template>
   <stylesheet>