diff --git a/sqp-addons/jrxml_reports/custom_reports.xml b/sqp-addons/jrxml_reports/custom_reports.xml
index 2262b77..b8d262a 100755
--- a/sqp-addons/jrxml_reports/custom_reports.xml
+++ b/sqp-addons/jrxml_reports/custom_reports.xml
@@ -306,7 +306,26 @@
not context.get('is_subcontract',False)
-
+
+
+
+
+ True
+ pdf
+ not context.get('is_subcontract',False)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sqp-addons/jrxml_reports/custom_reports/sqp_po_subcontract_print_subreport1.jrxml b/sqp-addons/jrxml_reports/custom_reports/sqp_po_subcontract_print_subreport1.jrxml
new file mode 100644
index 0000000..a945472
--- /dev/null
+++ b/sqp-addons/jrxml_reports/custom_reports/sqp_po_subcontract_print_subreport1.jrxml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sqp-addons/jrxml_reports/custom_reports/sqp_progress_work_subcon.jrxml b/sqp-addons/jrxml_reports/custom_reports/sqp_progress_work_subcon.jrxml
index 6d728a0..fb816b3 100755
--- a/sqp-addons/jrxml_reports/custom_reports/sqp_progress_work_subcon.jrxml
+++ b/sqp-addons/jrxml_reports/custom_reports/sqp_progress_work_subcon.jrxml
@@ -160,6 +160,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -454,13 +466,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
@@ -468,9 +480,9 @@
+ วันที่บังคับใช้ : 01/05/69]]>
@@ -523,20 +535,20 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -547,13 +559,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/sqp-addons/purchase_subcontract/purchase.py b/sqp-addons/purchase_subcontract/purchase.py
index f2e1012..05529a7 100755
--- a/sqp-addons/purchase_subcontract/purchase.py
+++ b/sqp-addons/purchase_subcontract/purchase.py
@@ -33,6 +33,9 @@ class purchase_order(osv.osv):
'is_subcontract': fields.boolean('Subcontract', readonly=False, change_default=True),
'sale_order_id': fields.many2one('sale.order', 'Copy SO Lines', required=False, domain=[('state', '<>', 'draft')], readonly=True, states={'draft': [('readonly', False)]}),
'ref_attention_2_id': fields.many2one('res.partner', 'Attention 2', readonly=False),
+ 'installation_start_date': fields.date('Installation Start Date'),
+ 'installation_end_date': fields.date('Installation End Date'),
+ 'number_of_workers': fields.integer('Number of Workers'),
}
_defaults = {
diff --git a/sqp-addons/purchase_subcontract/purchase_view.xml b/sqp-addons/purchase_subcontract/purchase_view.xml
index 4adec49..019ac14 100755
--- a/sqp-addons/purchase_subcontract/purchase_view.xml
+++ b/sqp-addons/purchase_subcontract/purchase_view.xml
@@ -43,7 +43,10 @@
-
+
+
+
+