conflict solved - local tax value has priority

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@439 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/PropertySheet/ValueAddedTax.py

@@ -42,7 +42,7 @@ class ValueAddedTax:
             'acquisition_base_category' : ('parent',),
             'acquisition_portal_type'   : invoice_or_invoice_movement_type_list,
             'acquisition_copy_value'    : 0,
-            'acquisition_mask_value'    : 0,
+            'acquisition_mask_value'    : 1,
             'acquisition_sync_value'    : 0,
             'acquisition_accessor_id'   : 'getValueAddedTaxRatio',
             'acquisition_depends'       : None,
@@ -53,7 +53,7 @@ class ValueAddedTax:
             'acquisition_base_category' : ('parent',),
             'acquisition_portal_type'   : invoice_or_invoice_movement_type_list,
             'acquisition_copy_value'    : 0,
-            'acquisition_mask_value'    : 0,
+            'acquisition_mask_value'    : 1,
             'acquisition_sync_value'    : 0,
             'acquisition_accessor_id'   : 'isValueAddedTaxRecoverable',
             'acquisition_depends'       : None,