Merge branch 'gudang-service' of https://bitbucket.org/altafixco/indoteknik-addons into gudang-service

1 files changed, 11 insertions, 12 deletions

diff --git a/indoteknik_custom/views/gudang_service.xml b/indoteknik_custom/views/gudang_service.xml
index 9a8382d3..e5cc94c4 100644
--- a/indoteknik_custom/views/gudang_service.xml
+++ b/indoteknik_custom/views/gudang_service.xml
@@ -6,10 +6,8 @@
         <field name="name">gudang.serivice.tree</field>
         <field name="model">gudang.service</field>
         <field name="arch" type="xml">
-		<tree string="Monitoring Barang Service" 
-		decoration-danger="state == 'draft'" decoration-warning="state == 'onprogress'" 
-		decoration-success="state == 'done'" decoration-muted="state == 'cancel'"
-		>
+		<tree string="Monitoring Barang Service" decoration-danger="state in ('draft', 'received_from_cust')" decoration-warning="state in ('sent_to_vendor', 'received_from_vendor')" 
+			decoration-success="state == 'delivered_to_cust'" decoration-muted="state == 'cancel'" >
 				<field name="name"/>
 				<field name="partner_id"/>
 				<field name="vendor_id"/>
@@ -17,8 +15,8 @@
 				<field name="schedule_date"/>
 				<field name="start_date" optional="hide"/>
 				<field name="remaining_date"/>
-				<field name="state" widget="badge" decoration-danger="state in ('draft')" decoration-warning="state == 'onprogress'" 
-				decoration-success="state == 'done'" decoration-muted="state == 'cancel'" />
+				<field name="state" widget="badge" decoration-danger="state in ('draft', 'received_from_cust')" decoration-warning="state in ('sent_to_vendor', 'received_from_vendor')" 
+				decoration-success="state == 'delivered_to_cust'" decoration-muted="state == 'cancel'" />
 				<field name="cancel_reason" optional="hide"/>
 				<field name="create_date" optional="hide"/>
             </tree>
@@ -33,16 +31,16 @@
 			<header>
 				<button name="action_submit" string="Proceed" type="object"
 						class="btn-primary"
-						attrs="{'invisible': [('state', 'in', ['cancel', 'done', 'onprogress'])]}"/>
+						attrs="{'invisible': [('state', 'in', ['cancel', 'done', 'received_from_vendor', 'delivered_to_cust'])]}"/>
 				<button name="action_done" string="Set Done" type="object"
 						class="btn-primary"
-						attrs="{'invisible': [('state', 'not in', ['onprogress'])]}"/>
+						attrs="{'invisible': [('state', 'not in', ['received_from_vendor'])]}"/>
 				<button name="action_cancel" string="Cancel" type="object"
 						class="btn-secondary"
-						attrs="{'invisible': [('state', 'in', ['cancel', 'done', 'draft'])]}"/>
+						attrs="{'invisible': [('state', 'in', ['cancel', 'delivered_to_cust'])]}"/>
 				<button name="action_draft" string="Set to Backlog" type="object"
 						class="btn-secondary"
-						attrs="{'invisible': [('state', 'in', ['draft', 'done', 'onprogress'])]}"/>
+						attrs="{'invisible': [('state', 'not in', ['cancel'])]}"/>
 				<field name="state" widget="statusbar" readonly="1"/>
 			</header>
 			<sheet>
@@ -58,16 +56,17 @@
 					<field name="remaining_date"/>
 					<field name="schedule_date" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
 					<field name="start_date" readonly="1"/>
-					<field name="done_date" attrs="{'invisible': [('state', 'not in', ['done'])]}"/>
+					<field name="done_date" attrs="{'invisible': [('state', 'not in', ['delivered_to_cust'])]}"/>
 					<field name="create_uid"/>
 					<field name="cancel_reason" 
-						attrs="{'invisible': [('state', 'in', ['done', 'draft'])]}"/>
+						attrs="{'invisible': [('state', 'in', ['delivered_to_cust', 'draft'])]}"/>
 				</group>
 					<notebook>
 						<page string="Product Lines" name="product_lines">
 							<field name="gudang_service_lines">
 								<tree string="Product Lines" editable="top" create="0" delete="1">
 									<field name="product_id"/>
+									<field name="quantity"/>
 								</tree>
 							</field>
 						</page>