[8.0.1.4.0] l10n_id_djbc_kb_lap_pemasukan

open-synergy · Nov 13, 2018 · 84984a6 · 84984a6
1 parent 60fa375
commit 84984a6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/l10n_id_djbc_plb_lap_pemasukan/__openerp__.py b/l10n_id_djbc_plb_lap_pemasukan/__openerp__.py
@@ -5,7 +5,7 @@
 {
     "name": "Indonesia - Lap. Pemasukan for DJBC's "
             "Pusat Logistik Berikat",
-    "version": "8.0.1.3.0",
+    "version": "8.0.1.4.0",
     "category": "localization",
     "website": "https://opensynergy-indonesia.com",
     "author": "OpenSynergy Indonesia",

diff --git a/l10n_id_djbc_plb_lap_pemasukan/reports/plb_lap_pemasukan.py b/l10n_id_djbc_plb_lap_pemasukan/reports/plb_lap_pemasukan.py
@@ -33,7 +33,7 @@ class LapPlbLapPemasukan(models.Model):
     )
 
     pengirim = fields.Many2one(
-        string="Pemasok/Pengirim",
+        string="Pembeli/Penerima",
         comodel_name="res.partner"
     )
 

diff --git a/l10n_id_djbc_plb_lap_pemasukan/reports/plb_lap_pemasukan.xml b/l10n_id_djbc_plb_lap_pemasukan/reports/plb_lap_pemasukan.xml
@@ -11,16 +11,17 @@
         <tree create="false" edit="false" delete="false">
             <field name="jenis_dokumen"/>
             <field name="no_dokumen"/>
-            <field name="tgl_dokumen"/>                        
-            <field name="no_penerimaan"/>            
-            <field name="tgl_penerimaan"/>            
-            <field name="pengirim"/>            
+            <field name="tgl_dokumen"/>
+            <field name="no_penerimaan"/>
+            <field name="tgl_penerimaan"/>
+            <field name="pengirim"/>
             <field name="pemilik_barang"/>
-            <field name="kode_barang"/>            
-            <field name="nama_barang"/>            
-            <field name="jumlah"/>            
-            <field name="satuan"/>            
-            <field name="nilai"/> 
+            <field name="warehouse_id"/>
+            <field name="kode_barang"/>
+            <field name="nama_barang"/>
+            <field name="jumlah"/>
+            <field name="satuan"/>
+            <field name="nilai"/>
         </tree>
     </field>
 </record>
@@ -32,17 +33,19 @@
         <search>
             <field name="jenis_dokumen"/>
             <field name="no_dokumen"/>
-            <field name="no_penerimaan"/>            
+            <field name="no_penerimaan"/>
             <field name="pengirim"/>
-            <field name="pemilik_barang"/>            
-            <field name="kode_barang"/>            
-            <field name="nama_barang"/>            
+            <field name="pemilik_barang"/>
+            <field name="kode_barang"/>
+            <field name="nama_barang"/>
             <field name="warehouse_id"/>
             <group string="Group By">
                 <filter name="grp_jenis_dokumen" string="Jenis Dokumen" context="{'group_by':'jenis_dokumen'}"/>
                 <filter name="grp_no_dokumen" string="No. Dokumen" context="{'group_by':'no_dokumen'}"/>
                 <filter name="grp_no_penerimaan" string="No. Penerimaan" context="{'group_by':'no_penerimaan'}"/>
                 <filter name="grp_pengirim" string="Pemasok/Pengirim" context="{'group_by':'pengirim'}"/>
+                <filter name="grp_pemilik" string="Pemilik" context="{'group_by':'pemilik_barang'}"/>
+                <filter name="grp_warehouse" string="Warehouse" context="{'group_by':'warehouse_id'}"/>
             </group>
         </search>
     </field>

diff --git a/l10n_id_djbc_plb_lap_pemasukan/wizards/date_range_selector.py b/l10n_id_djbc_plb_lap_pemasukan/wizards/date_range_selector.py
@@ -20,7 +20,7 @@ class PLBLapPemasukanWizard(models.TransientModel):
     partner_id = fields.Many2one(
         string="Pemilik Barang",
         comodel_name="res.partner",
-        required=True
+        required=False,
     )
 
     @api.multi
@@ -30,7 +30,7 @@ def action_print_sreen(self):
         criteria = [
             ("tgl_penerimaan", ">=", self.date_start),
             ("tgl_penerimaan", "<=", self.date_end),
-            ("pemilik_barang", "=", self.partner_id.id)
+            ("warehouse_id", "in", self.warehouse_ids.ids)
         ]
         waction.domain = criteria
         return waction.read()[0]
diff --git a/l10n_id_djbc_plb_lap_pemasukan/wizards/date_range_selector_views.xml b/l10n_id_djbc_plb_lap_pemasukan/wizards/date_range_selector_views.xml
@@ -11,16 +11,10 @@
             <field name="mode">primary</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='warehouse_ids']" position="attributes">
-                        <attribute name="required">False</attribute>
-                    </xpath>
-                    <xpath expr="//field[@name='warehouse_ids']" position="replace">
-                        <field name="partner_id"/>
-                    </xpath>
                 </data>
             </field>
         </record>
-        
+
         <record id="plb_lap_pemasukan_wizard_action" model="ir.actions.act_window">
             <field name="name">Pemasukan Barang</field>
             <field name="res_model">l10n_id.plb_lap_pemasukan_wizard</field>