Merge lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve-yaml-fix-rev-kty into lp:openerp-venezuela-localization

[Katherine Zaoral (Vauxoo)]

[MERGE] fix views warning and yaml test cases definition errors.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

waiting for runbot

[lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve-yaml-fix-rev-kty]

1037. By Katherine Zaoral (Vauxoo) on 2014-09-23

[FIX] remove error field.

1038. By Katherine Zaoral (Vauxoo) on 2014-09-23

[ADD] add the propagate invoice date to income withholding attribute in the
company to make the yaml test casework with the new workflow requirements.

1039. By Katherine Zaoral (Vauxoo) on 2014-09-23

[FIX] syntax error.

1040. By Katherine Zaoral (Vauxoo) on 2014-09-23

[FIX] reference to a wrong model.

1041. By Katherine Zaoral (Vauxoo) on 2014-09-23

[FIX] missing definition of dictionary.

1042. By Katherine Zaoral (Vauxoo) on 2014-09-23

[MERGE] ovl revno 1035.

1043. By Katherine Zaoral (Vauxoo) on 2014-09-23

[REM] revert change.

1044. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-24

[FIX] Missing date in case inv_brw is None

1045. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-24

[FIX] add missing field to an yml test Wh definition.

1046. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-24

[FIX] Missing dependency on report_webkit

1047. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-24

[FIX] Missing field in YAML test
[FIX] Wrong parameter in method call

1048. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-24

[IMP] Adding Security Settings to islr.wh.historical.data model

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Runbot Has Gone Green

review: Approve

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

great
i will proceed with the merge
regards

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Merge done
On Sep 23, 2014 11:39 PM, "Katherine Zaoral (Vauxoo)" <
<email address hidden>> wrote:

> great
> i will proceed with the merge
> regards
>
> --
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/7.0-l10n_ve-yaml-fix-rev-kty/+merge/235678
> You are reviewing the proposed merge of
> lp:~vauxoo/openerp-venezuela-localization/7.0-l10n_ve-yaml-fix-rev-kty into
> lp:openerp-venezuela-localization.
>

=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
--- l10n_ve_withholding_islr/__openerp__.py	2014-09-18 21:21:38 +0000
+++ l10n_ve_withholding_islr/__openerp__.py	2014-09-24 01:46:47 +0000
@@ -42,7 +42,14 @@
 #If you want be able to propose withholding concepts from sales and purchases you must install extra module @section{l10n_ve_sale_purchase}.
 
 ''',
-    "depends" : ["account", "l10n_ve_withholding", "l10n_ve_fiscal_requirements", "product"], # ,"edi"],
+    "depends" : [
+        "account",
+        "l10n_ve_withholding",
+        "l10n_ve_fiscal_requirements",
+        "product",
+        "report_webkit",
+        # ,"edi"],
+    ],
     "init_xml" : [],
     "demo_xml":[
             "demo/l10n_ve_islr_withholding_demo.xml",

=== modified file 'l10n_ve_withholding_islr/model/islr_wh_doc.py'
--- l10n_ve_withholding_islr/model/islr_wh_doc.py	2014-09-23 18:39:45 +0000
+++ l10n_ve_withholding_islr/model/islr_wh_doc.py	2014-09-24 01:46:47 +0000
@@ -903,7 +903,7 @@
                 base += base_line
 
             #rate_base, rate_minimum, rate_wh_perc, rate_subtract, rate_code, rate_id, rate_name, rate2 = self._get_rate(
-            #    cr, uid, ail_brw.concept_id.id, residence, nature, inv_brw=ail_brw.invoice_id, context=context)
+            #    cr, uid, ail_brw.concept_id.id, residence, nature, base=base, inv_brw=ail_brw.invoice_id, context=context)
             rate_tuple = self._get_rate(
                 cr, uid, concept_id, residence, nature, base=base, inv_brw=iwdl_brw.invoice_id, context=context)
 
@@ -979,7 +979,7 @@
                     base += base_line
 
             rate_tuple = self._get_rate(
-                cr, uid, concept_id, residence, nature, base_line=0.0, inv_brw=iwdl_brw.invoice_id, context=context)
+                cr, uid, concept_id, residence, nature, base=0.0, inv_brw=iwdl_brw.invoice_id, context=context)
 
             if rate_tuple[7]:
                 apply = True
@@ -1148,7 +1148,7 @@
         islr_rate_args = [('concept_id','=',concept_id),('nature','=',nature),('residence','=',residence),]
         order = 'minimum desc'
 
-        date_ret = inv_brw.islr_wh_doc_id.date_uid
+        date_ret = inv_brw and inv_brw.islr_wh_doc_id.date_uid or time.strftime('%Y-%m-%d')
 
         concept_brw = self.pool.get('islr.wh.concept').browse(cr, uid, concept_id)
 

=== modified file 'l10n_ve_withholding_islr/security/ir.model.access.csv'
--- l10n_ve_withholding_islr/security/ir.model.access.csv	2014-06-27 21:21:30 +0000
+++ l10n_ve_withholding_islr/security/ir.model.access.csv	2014-09-24 01:46:47 +0000
@@ -29,3 +29,7 @@
 access_account_islr_xml_wh_line_manager,islr.xml.wh.line.manager,model_islr_xml_wh_line,l10n_ve_withholding_islr.group_account_wh_islr_manager,1,1,1,1
 
 access_account_islr_xml_wh_doc_manager,islr.xml.wh.doc.manager,model_islr_xml_wh_doc,l10n_ve_withholding_islr.group_account_wh_islr_manager,1,1,1,1
+
+access_islr_wh_historical_data_user,islr.wh.historical.data.user,model_islr_wh_historical_data,,1,1,1,0
+
+access_islr_wh_historical_data_manager,islr.wh.historical.data.manager,model_islr_wh_historical_data,l10n_ve_withholding_islr.group_account_wh_islr_manager,1,1,1,1

=== modified file 'l10n_ve_withholding_islr/test/customer_wh_islr_doc.yml'
--- l10n_ve_withholding_islr/test/customer_wh_islr_doc.yml	2013-12-18 20:20:04 +0000
+++ l10n_ve_withholding_islr/test/customer_wh_islr_doc.yml	2014-09-24 01:46:47 +0000
@@ -90,6 +90,7 @@
         name: ISLR WH DOC (CUSTOMER MANUALLY)
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         account_id: account.a_recv
+        date_uid: !eval time.strftime('%Y-%m-%d')
 -
   I unlink the auto-loaded invoices.
 -

=== modified file 'l10n_ve_withholding_islr/test/supplier_wh_islr_doc.yml'
--- l10n_ve_withholding_islr/test/supplier_wh_islr_doc.yml	2013-12-18 20:20:04 +0000
+++ l10n_ve_withholding_islr/test/supplier_wh_islr_doc.yml	2014-09-24 01:46:47 +0000
@@ -867,6 +867,7 @@
         name: ISLR SUPPLIER WH DOC (MANUAL)
         partner_id: l10n_ve_fiscal_requirements.f_req_partner_1
         account_id: account.a_recv
+        date_uid: !eval time.strftime('%Y-%m-%d')
 -
   I unlink the auto-loaded invoices.
 -
@@ -895,7 +896,7 @@
         - len(invoice_ids) == 1
         - invoice_ids[0].invoice_id.id == ref( 'islr_manual_supplier_invoice' )
 -
-  I compute the taxes manually with the button 'Compute Icome Withholding'.
+  I compute the taxes manually with the button 'Compute Income Withholding'.
 -
     !function {model: islr.wh.doc, name: compute_amount_wh, id: islr_manual_supplier_wh_doc}:
         - model: islr.wh.doc

=== modified file 'l10n_ve_withholding_islr/test/supplier_wh_islr_invoice.yml'
--- l10n_ve_withholding_islr/test/supplier_wh_islr_invoice.yml	2013-12-18 19:49:59 +0000
+++ l10n_ve_withholding_islr/test/supplier_wh_islr_invoice.yml	2014-09-24 01:46:47 +0000
@@ -8,6 +8,11 @@
   !context
     'type': 'in_invoice'
 -
+ I set the company to propagate the invoice date to income withholding.
+-
+    !record {model: res.company, id: base.main_company}:
+        propagate_invoice_date_to_income_withholding: True
+-
   I check that the company is a income withholding agent and is at Venezuela.
 -
     !assert {model: res.partner, id: base.main_partner, string: The companu is a non-withholdable agent}:

=== modified file 'l10n_ve_withholding_islr/view/islr_wh_concept_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_concept_view.xml	2014-09-20 16:41:36 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_concept_view.xml	2014-09-24 01:46:47 +0000
@@ -149,7 +149,6 @@
         <record model="ir.actions.act_window" id="action_wh_islr_rates">
             <field name="name">Income Withholding Rates</field>
             <field name="res_model">islr.rates</field>
-            <field name="model"></field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>