From 075b9626cf35e0a7221b2bdee43a3a0c1745b640 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 12 Jan 2016 17:06:30 +0530 Subject: [PATCH] [docs] update --- .../erpnext.controllers.status_updater.html | 36 +++++++- .../erpnext.controllers.stock_controller.html | 14 +++ erpnext/docs/current/index.html | 4 +- .../docs/current/models/accounts/account.html | 4 - .../models/accounts/purchase_invoice.html | 14 +++ .../models/accounts/sales_invoice.html | 14 +++ .../current/models/buying/purchase_order.html | 14 +++ .../docs/current/models/setup/company.html | 14 --- .../models/setup/terms_and_conditions.html | 12 +++ .../current/models/stock/delivery_note.html | 85 ++++++++++++++----- .../models/stock/delivery_note_item.html | 14 +++ .../docs/current/models/stock/price_list.html | 2 - .../models/stock/purchase_receipt.html | 69 ++++++++++++--- .../models/stock/purchase_receipt_item.html | 26 ++++-- .../current/models/stock/stock_entry.html | 32 ++++--- .../docs/current/models/stock/warehouse.html | 2 - 16 files changed, 273 insertions(+), 83 deletions(-) diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html index eb34f9bfb7..fddc5d7cbb 100644 --- a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html +++ b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html @@ -33,7 +33,7 @@ Installation Note: Update Installed Qty, Update Percent Qty and Validate over in _update_children - (self, args) + (self, args, update_modified)

Update quantities or amount in child table

@@ -43,11 +43,39 @@ Installation Note: Update Installed Qty, Update Percent Qty and Validate over in +

+ + + _update_modified + (self, args, update_modified) +

+

No docs

+
+
+ + + + +

_update_percent_field - (self, args) + (self, args, update_modified=True) +

+

Update percent field in parent transaction

+
+
+ + + + + +

+ + + _update_percent_field_in_targets + (self, args, update_modified=True)

Update percent field in parent transaction

@@ -131,14 +159,14 @@ Installation Note: Update Installed Qty, Update Percent Qty and Validate over in update_qty - (self, change_modified=True) + (self, update_modified=True)

Updates qty or amount at row level

Parameters:


diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html index fd3dc8cec3..f0833ebdab 100644 --- a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html +++ b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html @@ -194,6 +194,20 @@ +

+ + + update_billing_percentage + (self, update_modified=True) +

+

No docs

+
+
+ + + + +

diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 5762d0a52e..4c021c18b3 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.16.2 + 6.16.4 @@ -52,4 +52,4 @@ - + \ No newline at end of file diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index bbc0203e32..5b3103d65c 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -946,10 +946,6 @@ Credit - - - -

  • diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html index 197b896100..1bdbcbf029 100644 --- a/erpnext/docs/current/models/accounts/purchase_invoice.html +++ b/erpnext/docs/current/models/accounts/purchase_invoice.html @@ -1750,6 +1750,20 @@ Yearly +

    + + + update_billing_status_in_pr + (self, update_modified=True) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html index 9bd05d4b2e..07e32122ec 100644 --- a/erpnext/docs/current/models/accounts/sales_invoice.html +++ b/erpnext/docs/current/models/accounts/sales_invoice.html @@ -2361,6 +2361,20 @@ Yearly +

    + + + update_billing_status_in_dn + (self, update_modified=True) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html index 202cb44a10..bbf1dce06b 100644 --- a/erpnext/docs/current/models/buying/purchase_order.html +++ b/erpnext/docs/current/models/buying/purchase_order.html @@ -1555,6 +1555,20 @@ Yearly +

    + + + get_last_purchase_rate + (self) +

    +

    get last purchase rates for all items

    +
    +
    + + + + +

    diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html index 27e2294966..88381d143b 100644 --- a/erpnext/docs/current/models/setup/company.html +++ b/erpnext/docs/current/models/setup/company.html @@ -824,20 +824,6 @@ Stop -

    - - - add_acc - (self, lst) -

    -

    No docs

    -
    -
    - - - - -

    diff --git a/erpnext/docs/current/models/setup/terms_and_conditions.html b/erpnext/docs/current/models/setup/terms_and_conditions.html index 95acfe1b84..cc3fdeeb51 100644 --- a/erpnext/docs/current/models/setup/terms_and_conditions.html +++ b/erpnext/docs/current/models/setup/terms_and_conditions.html @@ -64,6 +64,18 @@ Examples: 2 + disabled + + Check + + Disabled + + + + + + + 3 terms Text Editor diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html index 64a872b006..29b6b773fd 100644 --- a/erpnext/docs/current/models/stock/delivery_note.html +++ b/erpnext/docs/current/models/stock/delivery_note.html @@ -1316,8 +1316,20 @@ Campaign - + 86 + per_billed + + Currency + + % Amount Billed + + + + + + + 87 printing_details Section Break @@ -1329,7 +1341,7 @@ Campaign - 87 + 88 letter_head Link @@ -1350,7 +1362,7 @@ Campaign - 88 + 89 select_print_heading Link @@ -1371,7 +1383,7 @@ Campaign - 89 + 90 column_break_88 Column Break @@ -1383,7 +1395,7 @@ Campaign - 90 + 91 print_without_amount Check @@ -1395,7 +1407,7 @@ Campaign - 91 + 92 section_break_83 Section Break @@ -1407,7 +1419,7 @@ Campaign - 92 + 93 status Select @@ -1418,14 +1430,15 @@ Campaign 

     Draft
-Submitted
+To Bill
+Completed
 Cancelled
 Closed
    - 93 + 94 per_installed Percent @@ -1438,7 +1451,7 @@ Closed - 94 + 95 installation_status Select @@ -1450,7 +1463,7 @@ Closed - 95 + 96 column_break_89 Column Break @@ -1462,7 +1475,7 @@ Closed - 96 + 97 to_warehouse Link @@ -1484,7 +1497,7 @@ Closed - 97 + 98 excise_page Data @@ -1496,7 +1509,7 @@ Closed - 98 + 99 instructions Text @@ -1508,7 +1521,7 @@ Closed - 99 + 100 sales_team_section_break Section Break @@ -1522,7 +1535,7 @@ Closed - 100 + 101 sales_partner Link @@ -1543,7 +1556,7 @@ Closed - 101 + 102 column_break7 Column Break @@ -1555,7 +1568,7 @@ Closed - 102 + 103 commission_rate Float @@ -1567,7 +1580,7 @@ Closed - 103 + 104 total_commission Currency @@ -1581,7 +1594,7 @@ Closed - 104 + 105 section_break1 Section Break @@ -1593,7 +1606,7 @@ Closed - 105 + 106 sales_team Table @@ -1778,6 +1791,20 @@ Closed +

    + + + update_billing_status + (self, update_modified=True) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1999,6 +2026,22 @@ Closed + +

    + + + erpnext.stock.doctype.delivery_note.delivery_note.update_billed_amount_based_on_so + (so_detail, update_modified=True) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status

    diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html index c7abefed9d..1c48c11e0e 100644 --- a/erpnext/docs/current/models/stock/delivery_note_item.html +++ b/erpnext/docs/current/models/stock/delivery_note_item.html @@ -746,6 +746,20 @@ 49 + billed_amt + + Currency + + Billed Amt + + + + 
    currency
    + + + + + 50 page_break Check diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html index 28e2cec31e..60d5b2eabe 100644 --- a/erpnext/docs/current/models/stock/price_list.html +++ b/erpnext/docs/current/models/stock/price_list.html @@ -391,8 +391,6 @@ Price List Master - -
  • diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html index ee9ed2768d..dda39796f5 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt.html +++ b/erpnext/docs/current/models/stock/purchase_receipt.html @@ -1082,7 +1082,8 @@ Yes 
     Draft
-Submitted
+To Bill
+Completed
 Cancelled
 Closed
    @@ -1157,6 +1158,18 @@ Closed 77 + per_billed + + Percent + + % Amount Billed + + + + + + + 78 company Link @@ -1177,7 +1190,7 @@ Closed - 78 + 79 fiscal_year Link @@ -1198,7 +1211,7 @@ Closed - 79 + 80 printing_settings Section Break @@ -1210,7 +1223,7 @@ Closed - 80 + 81 letter_head Link @@ -1231,7 +1244,7 @@ Closed - 81 + 82 select_print_heading Link @@ -1252,7 +1265,7 @@ Closed - 82 + 83 other_details HTML @@ -1264,7 +1277,7 @@ Closed - 83 + 84 instructions Small Text @@ -1276,7 +1289,7 @@ Closed - 84 + 85 remarks Small Text @@ -1288,7 +1301,7 @@ Closed - 85 + 86 transporter_info Section Break @@ -1302,7 +1315,7 @@ Closed - 86 + 87 transporter_name Data @@ -1314,7 +1327,7 @@ Closed - 87 + 88 column_break5 Column Break @@ -1326,7 +1339,7 @@ Closed - 88 + 89 lr_no Data @@ -1338,7 +1351,7 @@ Closed - 89 + 90 lr_date Date @@ -1570,6 +1583,20 @@ Closed +

    + + + update_billing_status + (self, update_modified=True) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1753,6 +1780,22 @@ Closed + +

    + + + erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_billed_amount_based_on_po + (po_detail, update_modified=True) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status

    diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html index 025f291cdc..1ee6b14086 100644 --- a/erpnext/docs/current/models/stock/purchase_receipt_item.html +++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html @@ -794,6 +794,18 @@ 53 + billed_amt + + Currency + + Billed Amt + + + + + + + 54 brand Link @@ -814,7 +826,7 @@ - 54 + 55 item_group Link @@ -835,7 +847,7 @@ - 55 + 56 rm_supp_cost Currency @@ -849,7 +861,7 @@ - 56 + 57 item_tax_amount Currency @@ -863,7 +875,7 @@ - 57 + 58 landed_cost_voucher_amount Currency @@ -875,7 +887,7 @@ - 58 + 59 valuation_rate Currency @@ -889,7 +901,7 @@ - 59 + 60 item_tax_rate Small Text @@ -903,7 +915,7 @@ Used for Taxes and Charges

    - 60 + 61 page_break Check diff --git a/erpnext/docs/current/models/stock/stock_entry.html b/erpnext/docs/current/models/stock/stock_entry.html index 652d8162fb..29bc11e7bc 100644 --- a/erpnext/docs/current/models/stock/stock_entry.html +++ b/erpnext/docs/current/models/stock/stock_entry.html @@ -1191,20 +1191,6 @@ whichever is less

    -

    - - - get_warehouse_details - (self, args) -

    -

    No docs

    -
    -
    - - - - -

    @@ -1580,6 +1566,24 @@ the raw materials supplied table

    + + + +

    Public API +
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details +

    +

    + + + erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details + (args) +

    +

    No docs

    +
    +
    + + + diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html index 2d7108b2b0..c0fa5d3d6b 100644 --- a/erpnext/docs/current/models/stock/warehouse.html +++ b/erpnext/docs/current/models/stock/warehouse.html @@ -629,8 +629,6 @@ A logical Warehouse against which stock entries are made. - -