diff --git a/addons/account/account.py b/addons/account/account.py
index 46bd901d6b3..919871202f1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -314,7 +314,7 @@ class account_journal(osv.osv):
 	_description = "Journal"
 	_columns = {
 		'name': fields.char('Journal Name', size=64, required=True),
-		'code': fields.char('Code', size=9),
+		'code': fields.char('Code', size=16),
 		'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True),
 		'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view')]),
 		'active': fields.boolean('Active'),
diff --git a/addons/l10n_ch/bvr/bvr.rml b/addons/l10n_ch/bvr/bvr.rml
index 5d4d948c6ea..1e73b8d6abb 100644
--- a/addons/l10n_ch/bvr/bvr.rml
+++ b/addons/l10n_ch/bvr/bvr.rml
@@ -1,9 +1,20 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <docinit>
+    <registerFont fontName="ocrb" fontFile="addons/l10n_ch/bvr/ocrbb.ttf"/>
+  </docinit>
+  <template pageSize="(210mm,297mm)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="527" height="706"/>
-      <frame id="Frame1" x1="33.0" y1="32" width="527.0" height="210.0"/>
+      <frame id="first" x1="34.0" y1="110mm" width="527" height="162mm"/>
+      <frame id="Frame1"
+		x1="2.5mm"
+		y1="0.5mm"
+		width="200mm"
+		height="111mm"/>
+
+	  <!--
+      <frame id="Frame1" x1="[[ '%.2f' % (14.5 + user.company_id.bvr_delta_horz or 0.0) ]]mm" y1="[[ '%.2f' % (4.5 + user.company_id.bvr_delta_vert or 0.0) ]]mm" width="200mm" height="111mm"/>
+	  -->
     </pageTemplate>
   </template>
   <stylesheet>
@@ -24,10 +35,10 @@
     </initialize>
     <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
     <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="PBVR" fontName="ocrb" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="ocrb" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P7" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="P8" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P9" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -77,35 +88,67 @@
     </para>
     <para style="P11">[[ user.signature ]]</para>
     <currentFrame name="Frame1"/>
-    <blockTable colWidths="144.0,151.0,243.0" rowheights="3cm,1cm,1cm,1cm,3cm,1cm" style="Table1">
+	<!--
+		Width: 2.3inch, 5.9inch
+		Height: 4*1/6 inch
+	-->
+	<illustration width="200mm" height="106mm">
+		<setFont name="Times-Roman" size="11"/>
+		<drawString x="6mm" y="79mm">[[ user.company_id.partner_id.name ]]</drawString>
+		<drawString x="6mm" y="74mm">[[ user.company_id.partner_id.address[0].street ]]</drawString>
+		<drawString x="6mm" y="69mm">[[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
+		<drawString x="6mm" y="64mm">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]]</drawString>
+
+		<drawString x="62mm" y="79mm">[[ user.company_id.partner_id.name ]]</drawString>
+		<drawString x="62mm" y="74mm">[[ user.company_id.partner_id.address[0].street ]]</drawString>
+		<drawString x="62mm" y="69mm">[[ (user.company_id.partner_id.address[0].street2 or '')]]</drawString>
+		<drawString x="62mm" y="64mm">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]]</drawString>
+
+		<setFont name="ocrb" size="12"/>
+		<drawString x="126mm" y="67.5mm">[[ mod10r(o.number).rjust(27,'0') ]]</drawString>
+
+		<drawRightString x="39mm" y="50mm">[[ ('%.2f' % o.amount_total)[:-3] ]]</drawRightString>
+		<drawRightString x="100mm" y="50mm">[[ ('%.2f' % o.amount_total)[:-3] ]]</drawRightString>
+
+		<drawCentredString x="51mm" y="50mm">[[ ('%.2f' % o.amount_total)[-2:] ]]</drawCentredString>
+		<drawCentredString x="111mm" y="50mm">[[ ('%.2f' % o.amount_total)[-2:] ]]</drawCentredString>
+
+		<!--
+			Exact value: y=17.6mm
+
+		-->
+		<drawString x="66.72mm" y="16.20mm">01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]&gt;[[ mod10r(o.number).rjust(27,'0')]]+ [[user.company_id.bvr_number.split('-')[0]+(user.company_id.bvr_number.split('-')[1]).rjust(6,'0')+user.company_id.bvr_number.split('-')[2] ]]</drawString>
+
+
+	</illustration>
+   <!--
+   <blockTable colWidths="144.0,151.0,243.0" rowheights="3cm,1cm,1cm,1cm,3cm,1cm" style="Table1">
       <tr>
         <td>
-          <para style="P1">[[ user.company_id.partner_id.name ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].name ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].street ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].street2 ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]]</para>
+          <para style="PBVR"></para>
+          <para style="PBVR"></para>
+          <para style="PBVR"></para>
+          <para style="PBVR"></para>
         </td>
         <td>
-          <para style="P1">[[ user.company_id.partner_id.name ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].name ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].street ]]</para>
-          <para style="P1">[[ user.company_id.partner_id.address[0].street2 ]]</para>
-          <para style="P2">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]]</para>
+          <para style="PBVR">[[ user.company_id.partner_id.name ]]</para>
+          <para style="PBVR">[[ user.company_id.partner_id.address[0].street ]]</para>
+          <para style="PBVR">[[ user.company_id.partner_id.address[0].street2 or '' ]]</para>
+          <para style="PBVR">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
-          <para style="P3">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
-          <para style="P3">[[ mod10r(o.number).rjust(27,'0') ]]</para>
+          <para style="PBVR"></para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P4">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
@@ -115,44 +158,44 @@
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P4">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
+          <para style="PBVR">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
         </td>
         <td>
-          <para style="P4">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
+          <para style="PBVR">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P5">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P5">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P5">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
 	  <tr>
         <td>
-          <para style="P5">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
@@ -163,21 +206,15 @@
 	  </tr>
       <tr>
         <td>
-          <para style="P5">
+          <para style="PBVR">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P6">01<font face="Times-Roman">[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]&gt;</font></para>
-        </td>
-        <td>
-          <para style="P3">[[ mod10r(o.number).rjust(27,'0')]]+ [[user.company_id.bvr_number]]&gt;</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P7">
-      <font color="white"> </font>
-    </para>
+	-->
     <frameEnd/>
   </story>
 </document>
diff --git a/addons/l10n_ch/bvr/ocrbb.ttf b/addons/l10n_ch/bvr/ocrbb.ttf
new file mode 100644
index 00000000000..ef8068be9c2
Binary files /dev/null and b/addons/l10n_ch/bvr/ocrbb.ttf differ
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index 660b2ef6c8a..936b62f9832 100644
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -35,6 +35,8 @@ class res_company(osv.osv):
 	_inherit = "res.company"
 	_columns = {
 		'bvr_number': fields.char('BVR Number', size=9),
+		'bvr_delta_horz': fields.float('BVR Horz. Delta (mm)', size=(16,2)),
+		'bvr_delta_vert': fields.float('BVR Vert. Delta (mm)', size=(16,2)),
 		'dta_number': fields.char('DTA Number', size=9),
 	}
 res_company()
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 1f1ad832121..4ddc13ef7dd 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -9,6 +9,8 @@
 			<field name="arch" type="xml">
 				<field name="rml_footer2" position="after">
 					<field name="bvr_number"/>
+					<field name="bvr_delta_horz"/>
+					<field name="bvr_delta_vert"/>
 					<field name="dta_number"/>
 				</field>
 			</field>
diff --git a/addons/l10n_ch/dta/dta_demo.xml b/addons/l10n_ch/dta/dta_demo.xml
index e1de5333316..1b785a63625 100644
--- a/addons/l10n_ch/dta/dta_demo.xml
+++ b/addons/l10n_ch/dta/dta_demo.xml
@@ -32,7 +32,7 @@
 
 	<record model="res.company" id="base.main_company">
 		<field name="dta_number">Co01</field>
-		<field name="bvr_number">Co01</field>
+		<field name="bvr_number">01-162-8</field>
 	</record>
 
 
diff --git a/addons/purchase_journal/purchase_journal_view.xml b/addons/purchase_journal/purchase_journal_view.xml
index 04157654b23..202adf98915 100644
--- a/addons/purchase_journal/purchase_journal_view.xml
+++ b/addons/purchase_journal/purchase_journal_view.xml
@@ -7,10 +7,22 @@
 		<field name="inherit_id" ref="stock.view_picking_form" />
 		<field name="arch" type="xml">
 			<field name="origin" position="after">
-				<field name="purchase_journal_id" select="1"/>
+				<field name="purchase_journal_id" select="1" readonly="1"/>
 			</field>
 		</field>
 	</record>
+	<record model="ir.ui.view" id="purchase_journal_picking_order_tree">
+		<field name="name">stock.picking.purchase.journal.view.tree</field>
+		<field name="type">tree</field>
+		<field name="model">stock.picking</field>
+		<field name="inherit_id" ref="stock.vpicktree" />
+		<field name="arch" type="xml">
+			<field name="invoice_state" position="after">
+				<field name="purchase_journal_id"/>
+			</field>
+		</field>
+	</record>
+
 
 	<record model="ir.ui.view" id="view_purchase_journal_form">
 		<field name="name">purchase_journal.purchase.journal.form</field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0f4955ecaa4..97f8c0e60b5 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -366,7 +366,7 @@ class sale_order(osv.osv):
 						})
 
 					move_id = self.pool.get('stock.move').create(cr, uid, {
-						'name':'SO:'+order.name,
+						'name':line.name,
 						'picking_id': picking_id,
 						'product_id': line.product_id.id,
 						'date_planned': date_planned,
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e147b520647..e650eba0b85 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -269,8 +269,8 @@
 	<record model="ir.ui.view" id="view_order_pos_form">
 		<field name="name">sale.order.pos</field>
 		<field name="model">sale.order</field>
-		<field name="priority">25</field>
 		<field name="type">form</field>
+		<field name="priority" eval="32"/>
 		<field name="arch" type="xml">
 			<form string="Sales Order POS">
 				<notebook>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index b9c8171cb21..76bb98c49d5 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -31,7 +31,7 @@ from osv import osv, fields
 class stock_move(osv.osv):
 	_inherit = 'stock.move'
 	_columns = {
-		'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True),
+		'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
 	}
 	_defaults = {
 		'sale_line_id': lambda *a:False
@@ -41,7 +41,7 @@ stock_move()
 class stock_picking(osv.osv):
 	_inherit = 'stock.picking'
 	_columns = {
-		'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
+		'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True, readonly=True),
 	}
 	_defaults = {
 		'sale_id': lambda *a: False
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 65bf156a0d1..b07ad1a4a4b 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -175,9 +175,9 @@
 		<field name="inherit_id" ref="stock.view_picking_form" />
 		<field name="arch" type="xml">
 			<field name="origin" position="after">
-				<field name="journal_id" select="1"/>
-				<field name="sale_journal_id" select="1"/>
 				<field name="invoice_type_id" select="1"/>
+				<field name="sale_journal_id" select="1"/>
+				<field name="journal_id" select="1"/>
 			</field>
 		</field>
 	</record>
@@ -189,9 +189,9 @@
 		<field name="inherit_id" ref="stock.vpicktree" />
 		<field name="arch" type="xml">
 			<field name="invoice_state" position="after">
-				<field name="journal_id" select="1"/>
 				<field name="sale_journal_id" select="1"/>
 				<field name="invoice_type_id" select="1"/>
+				<field name="journal_id" select="1"/>
 			</field>
 		</field>
 	</record>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5467e6c1b61..8056225610d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -336,7 +336,7 @@ class stock_picking(osv.osv):
 		'auto_picking': fields.boolean('Auto-Picking'),
 		'work': fields.boolean('Work todo'),
 		'loc_move_id': fields.many2one('stock.location', 'Move to Location'),
-		'address_id': fields.many2one('res.partner.address', 'Partner Address'),
+		'address_id': fields.many2one('res.partner.address', 'Partner'),
 		'lot_id': fields.many2one('stock.lot', 'Consumer Lot Created'),
 		'move_lot_id': fields.many2one('stock.move.lot', 'Moves Created'),
 		'invoice_state':fields.selection([
@@ -500,7 +500,6 @@ class stock_picking(osv.osv):
 				'name': p.name,
 				'origin': p.name+':'+p.origin,
 				'type': type,
-				'reference': "P%dSO%d"%(p.address_id.partner_id.id,p.id),
 				'account_id': a,
 				'partner_id': p.address_id.partner_id.id,
 				'address_invoice_id': pinv_id,
@@ -533,7 +532,7 @@ class stock_picking(osv.osv):
 				if type in ('in_invoice','in_refund'):
 					punit = line.product_id.standard_price
 				iline_id = self.pool.get('account.invoice.line').create(cr, uid, {
-					'name': p.name + ' - ' + line.name,
+					'name': ((group and (p.name + ' - ')) or '') + line.name,
 					'invoice_id': invoice_id,
 					'uos_id': line.product_uos.id,
 					'product_id': line.product_id.id,
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6594ec9862d..e0701e58818 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -433,8 +433,8 @@
  					<field name="invoice_state" select="1"/>
 					<field name="loc_move_id" select="1"/>
 					<newline/>
-					<field name="location_id" select="1"/>
-					<field name="location_dest_id" select="1"/>
+					<field name="location_id"/>
+					<field name="location_dest_id"/>
 					<field name="address_id" select="1"/>
 					<field name="move_lines" widget="one2many_list" colspan="4" nolabel="1">
 						<form string="Stock Moves">