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 @@
-
+
+
+
+
-
-
+
+
+
+
@@ -24,10 +35,10 @@
-
+
-
+
@@ -77,35 +88,67 @@
[[ user.signature ]]
-
+
+
+
+ [[ user.company_id.partner_id.name ]]
+ [[ user.company_id.partner_id.address[0].street ]]
+ [[ (user.company_id.partner_id.address[0].street2 or '')]]
+ [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]]
+
+ [[ user.company_id.partner_id.name ]]
+ [[ user.company_id.partner_id.address[0].street ]]
+ [[ (user.company_id.partner_id.address[0].street2 or '')]]
+ [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]]
+
+
+ [[ mod10r(o.number).rjust(27,'0') ]]
+
+ [[ ('%.2f' % o.amount_total)[:-3] ]]
+ [[ ('%.2f' % o.amount_total)[:-3] ]]
+
+ [[ ('%.2f' % o.amount_total)[-2:] ]]
+ [[ ('%.2f' % o.amount_total)[-2:] ]]
+
+
+ 01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]>[[ 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] ]]
+
+
+
+
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 @@
+
+
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 @@
Co01
- Co01
+ 01-162-8
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 @@
-
+
+
+ stock.picking.purchase.journal.view.tree
+ tree
+ stock.picking
+
+
+
+
+
+
+
+
purchase_journal.purchase.journal.form
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 @@
sale.order.pos
sale.order
- 25
form
+
@@ -189,9 +189,9 @@
-
+
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 @@
-
-
+
+