diff --git a/addons/account/account.py b/addons/account/account.py
index 78f501c0692..37894af85ae 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -858,6 +858,12 @@ class account_tax_code(osv.osv):
'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
+ def name_get(self, cr, uid, ids, context={}):
+ if not len(ids):
+ return []
+ reads = self.read(cr, uid, ids, ['name','code'], context)
+ return map(lambda x: (x['id'],x['code'] or x['name']), reads)
+
def _default_company(self, cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
@@ -879,7 +885,7 @@ class account_tax_code(osv.osv):
_constraints = [
(_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
]
- _order = 'name'
+ _order = 'code,name'
account_tax_code()
class account_tax(osv.osv):
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index a1aa97432b8..7b78e7317ce 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6367,56 +6367,170 @@
#
# Tax Code Configuration
#
-
- A82
-
-
- A86
-
-
- A84
-
-
- A85
-
-
- A87
-
-
- A64
-
-
- A58
-
-
- A59
-
-
- A54
-
-
- A55
-
-
- A56
-
-
- A49
-
-
- A45
-
-
- A03
+
+ II. Operations a la sortie
+
- A00
+ 00
+
+ Operations soumises a un regime particulier
- A01
+ 01
+
+ Operations avec TVA a 6%
- A02
+ 02
+
+ Operations avec TVA a 12%
+
+
+ 03
+
+ Operations avec TVA a 21%
+
+
+
+ 45
+ Operations avec TVA due par le concotractant
+
+
+
+ 46
+ Livraisons intra-communautaire exemptees
+
+
+
+ 47
+ Autres operations exemptees
+
+
+
+
+ Notes de credit et corrections negatives
+
+
+
+ Notes de credit aux operations grille 46
+ 48
+
+
+
+ Notes de credit aux operations du point II
+ 49
+
+
+
+
+
+
+
+
+
+ V. Solde des taxes dues a l'Etat
+
+
+ IV. Taxes dues
+ xx
+
+
+
+
+ 54
+ TVA sur operations des grilles 01,02,03
+
+
+
+ 55
+ TVA sur operations des grilles 86
+
+
+
+ 56
+ TVA sur operations des grilles 87
+
+
+
+ 57
+ TVA relatives aux importations
+
+
+
+ 61
+ Diverses regularisations en faveur de l'Etat
+
+
+
+ 63
+ TVA a reverser sur notes de credit recues
+
+
+
+
+
+
+
+
+ V. Taxes deductibles
+ yy
+
+
+
+ 59
+ T.V.A. deductible
+
+
+
+ 62
+ Regularisations TVA en faveur du declarant
+
+
+
+ 64
+ TVA a recuperer sur notes de credit delivrees
+
+
+
+
+
+ III. Operations a l'entree
+
+
+ 81
+ Marchandises, matieres premieres et auxiliaires
+
+
+
+ 82
+ Services et biens divers
+
+
+
+ 83
+ Biens d'investissement
+
+
+
+ 84
+ Notes de credits sur operations case 86
+
+
+
+ 85
+ Notes de credits autres operations
+
+
+
+ 86
+ Acquisition intra-communautaires et ventes ABC
+
+
+
+ 87
+ Autres operations
+
@@ -6433,7 +6547,7 @@
-
+
@@ -6445,17 +6559,28 @@
- VAT 21%
+ VAT 21% - Ventes
percent
-
-
-
-
+
+
+
+
-
+
+ VAT 21% - Achats
+
+ percent
+
+
+
+
+
+
+
+
VAT 0%
diff --git a/addons/product/product.py b/addons/product/product.py
index e748aea6875..54f0e207fd3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -95,7 +95,7 @@ class product_ul(osv.osv):
_description = "Shipping Unit"
_columns = {
'name' : fields.char('Name', size=64),
- 'type' : fields.selection([('box', 'Box'), ('carton', 'Carton')], 'Type', required=True),
+ 'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('palet', 'Palet')], 'Type', required=True),
}
product_ul()