[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation

erpnext/projects/doctype/time_log/time_log.js

@@ -22,6 +22,12 @@ frappe.ui.form.on("Time Log", "hours", function(frm) {
 	frm._setting_hours = false;
 });
 
+// clear production order if making time log
+frappe.ui.form.on("Time Log", "before_save", function(frm) {
+	frm.doc.production_order && frappe.model.remove_from_locals("Production Order",
+		frm.doc.production_order);
+});
+
 // set hours if to_time is updated
 frappe.ui.form.on("Time Log", "to_time", function(frm) {
 	if(frm._setting_hours) return;
@@ -69,7 +75,7 @@ $.extend(cur_frm.cscript, {
 			}
 		});
 	},
-	
+
 	time_log_for: function(doc) {
 		if (doc.time_log_for == 'Manufacturing') {
 			cur_frm.set_value("activity_type", "Manufacturing")

erpnext/projects/doctype/time_log/time_log.json

@@ -16,15 +16,6 @@
    "read_only": 0, 
    "reqd": 1
   }, 
-  {
-   "fieldname": "time_log_for", 
-   "fieldtype": "Select", 
-   "label": "Time Log For", 
-   "options": "\nProject\nManufacturing", 
-   "permlevel": 0, 
-   "precision": "", 
-   "reqd": 0
-  }, 
   {
    "fieldname": "from_time", 
    "fieldtype": "Datetime", 
@@ -51,6 +42,14 @@
    "permlevel": 0, 
    "read_only": 0
   }, 
+  {
+   "fieldname": "billable", 
+   "fieldtype": "Check", 
+   "in_list_view": 0, 
+   "label": "Billable", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
   {
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
@@ -67,6 +66,15 @@
    "read_only": 1, 
    "reqd": 0
   }, 
+  {
+   "fieldname": "time_log_for", 
+   "fieldtype": "Select", 
+   "label": "Time Log For", 
+   "options": "\nProject\nManufacturing", 
+   "permlevel": 0, 
+   "precision": "", 
+   "reqd": 0
+  }, 
   {
    "depends_on": "", 
    "fieldname": "activity_type", 
@@ -87,6 +95,13 @@
    "permlevel": 0, 
    "read_only": 0
   }, 
+  {
+   "depends_on": "eval:doc.time_log_for == 'Manufacturing'", 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "depends_on": "eval:doc.time_log_for == 'Manufacturing'", 
    "fieldname": "production_order", 
@@ -105,6 +120,12 @@
    "permlevel": 0, 
    "precision": ""
   }, 
+  {
+   "fieldname": "column_break_14", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "depends_on": "eval:doc.time_log_for == 'Manufacturing'", 
    "fieldname": "workstation", 
@@ -116,6 +137,7 @@
    "read_only": 1
   }, 
   {
+   "depends_on": "eval:doc.time_log_for == 'Manufacturing'", 
    "description": "Operation completed for how many finished goods?", 
    "fieldname": "completed_qty", 
    "fieldtype": "Float", 
@@ -123,14 +145,6 @@
    "permlevel": 0, 
    "precision": ""
   }, 
-  {
-   "fieldname": "billable", 
-   "fieldtype": "Check", 
-   "in_list_view": 0, 
-   "label": "Billable", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
   {
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
@@ -199,7 +213,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-02-05 05:11:48.252723", 
+ "modified": "2015-02-19 04:16:33.756377", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log",