From d7b7f74ac9c394e001c4624aa9d389382972a50e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 19:08:09 +0530 Subject: [PATCH] [docs] --- erpnext/docs/current/index.html | 2 +- .../accounts/payment_reconciliation.html | 8 +- .../models/accounts/shipping_rule.html | 9 -- erpnext/docs/current/models/hr/employee.html | 88 ++++++++----------- .../docs/current/models/hr/salary_slip.html | 48 +++------- .../current/models/stock/delivery_note.html | 55 +++++------- .../models/stock/delivery_note_item.html | 14 --- .../models/stock/purchase_receipt.html | 39 +++----- .../models/stock/purchase_receipt_item.html | 26 ++---- 9 files changed, 96 insertions(+), 193 deletions(-) diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 10582bef30c..fd23de4d886 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.15.1 + 6.16.1 diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation.html b/erpnext/docs/current/models/accounts/payment_reconciliation.html index 25a1edea82f..02e9dae0a98 100644 --- a/erpnext/docs/current/models/accounts/payment_reconciliation.html +++ b/erpnext/docs/current/models/accounts/payment_reconciliation.html @@ -152,7 +152,7 @@ Date - From Date + From Invoice Date @@ -164,7 +164,7 @@ Date - To Date + To Invoice Date @@ -176,7 +176,7 @@ Currency - Minimum Amount + Minimum Invoice Amount @@ -188,7 +188,7 @@ Currency - Maximum Amount + Maximum Invoice Amount diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html index 8f859cbc608..beadc90ff44 100644 --- a/erpnext/docs/current/models/accounts/shipping_rule.html +++ b/erpnext/docs/current/models/accounts/shipping_rule.html @@ -413,15 +413,6 @@ Net Weight - -
  • - - -Shopping Cart Shipping Rule - -
    • - - diff --git a/erpnext/docs/current/models/hr/employee.html b/erpnext/docs/current/models/hr/employee.html index 75d2d3d498d..5b76c2b0db0 100644 --- a/erpnext/docs/current/models/hr/employee.html +++ b/erpnext/docs/current/models/hr/employee.html @@ -679,18 +679,6 @@ Cheque 45 - emergency_contact_details - - HTML - - Emergency Contact Details - - - - - - - 46 person_to_be_contacted Data @@ -702,7 +690,7 @@ Cheque - 47 + 46 relation Data @@ -714,7 +702,7 @@ Cheque - 48 + 47 emergency_phone_number Data @@ -726,7 +714,7 @@ Cheque - 49 + 48 column_break4 Column Break @@ -738,7 +726,7 @@ Cheque - 50 + 49 permanent_accommodation_type Select @@ -754,7 +742,7 @@ Owned - 51 + 50 permanent_address Small Text @@ -766,7 +754,7 @@ Owned - 52 + 51 current_accommodation_type Select @@ -782,7 +770,7 @@ Owned - 53 + 52 current_address Small Text @@ -794,7 +782,7 @@ Owned - 54 + 53 sb53 Section Break @@ -806,7 +794,7 @@ Owned - 55 + 54 bio Text Editor @@ -819,7 +807,7 @@ Owned - 56 + 55 personal_details Section Break @@ -831,7 +819,7 @@ Owned - 57 + 56 column_break5 Column Break @@ -843,7 +831,7 @@ Owned - 58 + 57 passport_number Data @@ -855,7 +843,7 @@ Owned - 59 + 58 date_of_issue Date @@ -867,7 +855,7 @@ Owned - 60 + 59 valid_upto Date @@ -879,7 +867,7 @@ Owned - 61 + 60 place_of_issue Data @@ -891,7 +879,7 @@ Owned - 62 + 61 column_break6 Column Break @@ -903,7 +891,7 @@ Owned - 63 + 62 marital_status Select @@ -921,7 +909,7 @@ Widowed - 64 + 63 blood_group Select @@ -943,7 +931,7 @@ O- - 65 + 64 family_background Small Text @@ -956,7 +944,7 @@ O- - 66 + 65 health_details Small Text @@ -969,7 +957,7 @@ O- - 67 + 66 educational_qualification Section Break @@ -981,7 +969,7 @@ O- - 68 + 67 education Table @@ -1002,7 +990,7 @@ O- - 69 + 68 previous_work_experience Section Break @@ -1016,7 +1004,7 @@ O- - 70 + 69 external_work_history Table @@ -1037,7 +1025,7 @@ O- - 71 + 70 history_in_company Section Break @@ -1051,7 +1039,7 @@ O- - 72 + 71 internal_work_history Table @@ -1072,7 +1060,7 @@ O- - 73 + 72 exit Section Break @@ -1084,7 +1072,7 @@ O- - 74 + 73 column_break7 Column Break @@ -1096,7 +1084,7 @@ O- - 75 + 74 resignation_letter_date Date @@ -1108,7 +1096,7 @@ O- - 76 + 75 relieving_date Date @@ -1120,7 +1108,7 @@ O- - 77 + 76 reason_for_leaving Data @@ -1132,7 +1120,7 @@ O- - 78 + 77 leave_encashed Select @@ -1148,7 +1136,7 @@ No - 79 + 78 encashment_date Date @@ -1160,7 +1148,7 @@ No - 80 + 79 exit_interview_details Column Break @@ -1172,7 +1160,7 @@ No - 81 + 80 held_on Date @@ -1184,7 +1172,7 @@ No - 82 + 81 reason_for_resignation Select @@ -1200,7 +1188,7 @@ Health Concerns - 83 + 82 new_workplace Data @@ -1212,7 +1200,7 @@ Health Concerns - 84 + 83 feedback Small Text diff --git a/erpnext/docs/current/models/hr/salary_slip.html b/erpnext/docs/current/models/hr/salary_slip.html index 742ee94a4a4..07b1f83c37f 100644 --- a/erpnext/docs/current/models/hr/salary_slip.html +++ b/erpnext/docs/current/models/hr/salary_slip.html @@ -366,18 +366,6 @@ 21 - html_21 - - HTML - - - - - - - - - 22 earnings Table @@ -398,7 +386,7 @@ - 23 + 22 deduction Column Break @@ -410,19 +398,7 @@ - 24 - html_24 - - HTML - - - - - - - - - 25 + 23 deductions Table @@ -443,7 +419,7 @@ - 26 + 24 totals Section Break @@ -455,7 +431,7 @@ - 27 + 25 column_break_25 Column Break @@ -467,7 +443,7 @@ - 28 + 26 column_break_26 Column Break @@ -479,7 +455,7 @@ - 29 + 27 arrear_amount Currency @@ -493,7 +469,7 @@ - 30 + 28 leave_encashment_amount Currency @@ -507,7 +483,7 @@ - 31 + 29 gross_pay Currency @@ -521,7 +497,7 @@ - 32 + 30 total_deduction Currency @@ -535,7 +511,7 @@ - 33 + 31 net_pay Currency @@ -550,7 +526,7 @@ - 34 + 32 rounded_total Currency @@ -564,7 +540,7 @@ - 35 + 33 total_in_words Data diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html index 2213e24150c..64a872b0061 100644 --- a/erpnext/docs/current/models/stock/delivery_note.html +++ b/erpnext/docs/current/models/stock/delivery_note.html @@ -1316,20 +1316,8 @@ Campaign - - 86 - per_billed - - Currency - - % Amount Billed - - - - - - 87 + 86 printing_details Section Break @@ -1341,7 +1329,7 @@ Campaign - 88 + 87 letter_head Link @@ -1362,7 +1350,7 @@ Campaign - 89 + 88 select_print_heading Link @@ -1383,7 +1371,7 @@ Campaign - 90 + 89 column_break_88 Column Break @@ -1395,7 +1383,7 @@ Campaign - 91 + 90 print_without_amount Check @@ -1407,7 +1395,7 @@ Campaign - 92 + 91 section_break_83 Section Break @@ -1419,7 +1407,7 @@ Campaign - 93 + 92 status Select @@ -1430,15 +1418,14 @@ Campaign 
     Draft
-To Bill
-Completed
+Submitted
 Cancelled
 Closed
    - 94 + 93 per_installed Percent @@ -1451,7 +1438,7 @@ Closed - 95 + 94 installation_status Select @@ -1463,7 +1450,7 @@ Closed - 96 + 95 column_break_89 Column Break @@ -1475,7 +1462,7 @@ Closed - 97 + 96 to_warehouse Link @@ -1497,7 +1484,7 @@ Closed - 98 + 97 excise_page Data @@ -1509,7 +1496,7 @@ Closed - 99 + 98 instructions Text @@ -1521,7 +1508,7 @@ Closed - 100 + 99 sales_team_section_break Section Break @@ -1535,7 +1522,7 @@ Closed - 101 + 100 sales_partner Link @@ -1556,7 +1543,7 @@ Closed - 102 + 101 column_break7 Column Break @@ -1568,7 +1555,7 @@ Closed - 103 + 102 commission_rate Float @@ -1580,7 +1567,7 @@ Closed - 104 + 103 total_commission Currency @@ -1594,7 +1581,7 @@ Closed - 105 + 104 section_break1 Section Break @@ -1606,7 +1593,7 @@ Closed - 106 + 105 sales_team Table diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html index 1c48c11e0e2..c7abefed9d4 100644 --- a/erpnext/docs/current/models/stock/delivery_note_item.html +++ b/erpnext/docs/current/models/stock/delivery_note_item.html @@ -746,20 +746,6 @@ 49 - billed_amt - - Currency - - Billed Amt - - - - 
    currency
    - - - - - 50 page_break Check diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html index 0a3cc11f245..ee9ed2768d7 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt.html +++ b/erpnext/docs/current/models/stock/purchase_receipt.html @@ -1082,8 +1082,7 @@ Yes 
     Draft
-To Bill
-Completed
+Submitted
 Cancelled
 Closed
    @@ -1158,18 +1157,6 @@ Closed 77 - per_billed - - Percent - - % Amount Billed - - - - - - - 78 company Link @@ -1190,7 +1177,7 @@ Closed - 79 + 78 fiscal_year Link @@ -1211,7 +1198,7 @@ Closed - 80 + 79 printing_settings Section Break @@ -1223,7 +1210,7 @@ Closed - 81 + 80 letter_head Link @@ -1244,7 +1231,7 @@ Closed - 82 + 81 select_print_heading Link @@ -1265,7 +1252,7 @@ Closed - 83 + 82 other_details HTML @@ -1277,7 +1264,7 @@ Closed - 84 + 83 instructions Small Text @@ -1289,7 +1276,7 @@ Closed - 85 + 84 remarks Small Text @@ -1301,7 +1288,7 @@ Closed - 86 + 85 transporter_info Section Break @@ -1315,7 +1302,7 @@ Closed - 87 + 86 transporter_name Data @@ -1327,7 +1314,7 @@ Closed - 88 + 87 column_break5 Column Break @@ -1339,7 +1326,7 @@ Closed - 89 + 88 lr_no Data @@ -1351,7 +1338,7 @@ Closed - 90 + 89 lr_date Date diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html index 1ee6b14086c..025f291cdca 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt_item.html +++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html @@ -794,18 +794,6 @@ 53 - billed_amt - - Currency - - Billed Amt - - - - - - - 54 brand Link @@ -826,7 +814,7 @@ - 55 + 54 item_group Link @@ -847,7 +835,7 @@ - 56 + 55 rm_supp_cost Currency @@ -861,7 +849,7 @@ - 57 + 56 item_tax_amount Currency @@ -875,7 +863,7 @@ - 58 + 57 landed_cost_voucher_amount Currency @@ -887,7 +875,7 @@ - 59 + 58 valuation_rate Currency @@ -901,7 +889,7 @@ - 60 + 59 item_tax_rate Small Text @@ -915,7 +903,7 @@ Used for Taxes and Charges

    - 61 + 60 page_break Check