diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html index f0c8a32748..27f4ccdd4e 100644 --- a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html +++ b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html @@ -335,6 +335,20 @@ from tax inclusive amount

+

+ + + set_discount_amount + (self) +

+

No docs

+
+
+ + + + +

diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 6d00ab1bdb..82936e615c 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.12.11 + 6.13.1 diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index e70c6c2cf7..5b3103d65c 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -210,6 +210,7 @@ Profit and Loss 

 Bank
 Cash
+Depreciation
 Tax
 Chargeable
 Warehouse
@@ -945,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 31658d89d2..197b896100 100644 --- a/erpnext/docs/current/models/accounts/purchase_invoice.html +++ b/erpnext/docs/current/models/accounts/purchase_invoice.html @@ -717,32 +717,6 @@ Net Total 47 - column_break_46 - - Column Break - - - - - - - - - 48 - discount_amount - - Currency - - Additional Discount Amount - - - - 
    currency
    - - - - - 49 base_discount_amount Currency @@ -755,8 +729,46 @@ Net Total - + + 48 + column_break_46 + + Column Break + + + + + + + + + 49 + additional_discount_percentage + + Float + + Additional Discount Percentage + + + + + + 50 + discount_amount + + Currency + + Additional Discount Amount + + + + 
    currency
    + + + + + 51 section_break_49 Section Break @@ -768,7 +780,7 @@ Net Total - 51 + 52 base_grand_total Currency @@ -782,7 +794,7 @@ Net Total - 52 + 53 base_in_words Data @@ -794,7 +806,7 @@ Net Total - 53 + 54 column_break8 Column Break @@ -806,7 +818,7 @@ Net Total - 54 + 55 grand_total Currency @@ -820,7 +832,7 @@ Net Total - 55 + 56 in_words Data @@ -832,7 +844,7 @@ Net Total - 56 + 57 total_advance Currency @@ -846,7 +858,7 @@ Net Total - 57 + 58 outstanding_amount Currency @@ -860,7 +872,7 @@ Net Total - 58 + 59 write_off Section Break @@ -872,7 +884,7 @@ Net Total - 59 + 60 write_off_amount Currency @@ -886,7 +898,7 @@ Net Total - 60 + 61 base_write_off_amount Currency @@ -900,7 +912,7 @@ Net Total - 61 + 62 column_break_61 Column Break @@ -912,7 +924,7 @@ Net Total - 62 + 63 write_off_account Link @@ -933,7 +945,7 @@ Net Total - 63 + 64 write_off_cost_center Link @@ -954,7 +966,7 @@ Net Total - 64 + 65 advances_section Section Break @@ -968,7 +980,7 @@ Net Total - 65 + 66 get_advances_paid Button @@ -982,7 +994,7 @@ Net Total - 66 + 67 advances Table @@ -1003,7 +1015,7 @@ Net Total - 67 + 68 terms_section_break Section Break @@ -1017,7 +1029,7 @@ Net Total - 68 + 69 tc_name Link @@ -1038,7 +1050,7 @@ Net Total - 69 + 70 terms Text Editor @@ -1050,7 +1062,7 @@ Net Total - 70 + 71 contact_section Section Break @@ -1064,7 +1076,7 @@ Net Total - 71 + 72 supplier_address Link @@ -1085,7 +1097,7 @@ Net Total - 72 + 73 col_break23 Column Break @@ -1097,7 +1109,7 @@ Net Total - 73 + 74 contact_person Link @@ -1118,7 +1130,7 @@ Net Total - 74 + 75 printing_settings Section Break @@ -1130,7 +1142,7 @@ Net Total - 75 + 76 letter_head Link @@ -1151,7 +1163,7 @@ Net Total - 76 + 77 select_print_heading Link @@ -1172,7 +1184,7 @@ Net Total - 77 + 78 more_info Section Break @@ -1186,7 +1198,7 @@ Net Total - 78 + 79 credit_to Link @@ -1207,7 +1219,7 @@ Net Total - 79 + 80 party_account_currency Link @@ -1228,7 +1240,7 @@ Net Total - 80 + 81 is_opening Select @@ -1243,7 +1255,7 @@ Yes - 81 + 82 due_date Date @@ -1255,7 +1267,7 @@ Yes - 82 + 83 against_expense_account Small Text @@ -1267,7 +1279,7 @@ Yes - 83 + 84 column_break_63 Column Break @@ -1279,7 +1291,7 @@ Yes - 84 + 85 mode_of_payment Link @@ -1300,7 +1312,7 @@ Yes - 85 + 86 fiscal_year Link @@ -1321,7 +1333,7 @@ Yes - 86 + 87 remarks Small Text @@ -1333,7 +1345,7 @@ Yes - 87 + 88 recurring_invoice Section Break @@ -1347,7 +1359,7 @@ Yes - 88 + 89 is_recurring Check @@ -1359,7 +1371,7 @@ Yes - 89 + 90 recurring_type Select @@ -1377,7 +1389,7 @@ Yearly - 90 + 91 from_date Date @@ -1390,7 +1402,7 @@ Yearly - 91 + 92 to_date Date @@ -1403,7 +1415,7 @@ Yearly - 92 + 93 repeat_on_day_of_month Int @@ -1416,7 +1428,7 @@ Yearly - 93 + 94 end_date Date @@ -1429,7 +1441,7 @@ Yearly - 94 + 95 column_break_82 Column Break @@ -1441,7 +1453,7 @@ Yearly - 95 + 96 next_date Date @@ -1454,7 +1466,7 @@ Yearly - 96 + 97 recurring_id Data @@ -1467,7 +1479,7 @@ Yearly - 97 + 98 notification_email_address Small Text @@ -1480,7 +1492,7 @@ Yearly - 98 + 99 recurring_print_format Link diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html index a6fc5641a3..9bd05d4b2e 100644 --- a/erpnext/docs/current/models/accounts/sales_invoice.html +++ b/erpnext/docs/current/models/accounts/sales_invoice.html @@ -810,32 +810,6 @@ Net Total 53 - column_break_51 - - Column Break - - - - - - - - - 54 - discount_amount - - Currency - - Additional Discount Amount - - - - 
    currency
    - - - - - 55 base_discount_amount Currency @@ -848,8 +822,46 @@ Net Total - + + 54 + column_break_51 + + Column Break + + + + + + + + + 55 + additional_discount_percentage + + Float + + Additional Discount Percentage + + + + + + 56 + discount_amount + + Currency + + Additional Discount Amount + + + + 
    currency
    + + + + + 57 totals Section Break @@ -863,7 +875,7 @@ Net Total - 57 + 58 base_grand_total Currency @@ -877,7 +889,7 @@ Net Total - 58 + 59 base_rounded_total Currency @@ -891,7 +903,7 @@ Net Total - 59 + 60 base_in_words Data @@ -904,7 +916,7 @@ Net Total - 60 + 61 column_break5 Column Break @@ -916,7 +928,7 @@ Net Total - 61 + 62 grand_total Currency @@ -930,7 +942,7 @@ Net Total - 62 + 63 rounded_total Currency @@ -944,7 +956,7 @@ Net Total - 63 + 64 in_words Data @@ -956,7 +968,7 @@ Net Total - 64 + 65 total_advance Currency @@ -970,7 +982,7 @@ Net Total - 65 + 66 outstanding_amount Currency @@ -984,7 +996,7 @@ Net Total - 66 + 67 advances_section Section Break @@ -998,7 +1010,7 @@ Net Total - 67 + 68 get_advances_received Button @@ -1012,7 +1024,7 @@ Net Total - 68 + 69 advances Table @@ -1033,7 +1045,7 @@ Net Total - 69 + 70 payments_section Section Break @@ -1047,7 +1059,7 @@ Net Total - 70 + 71 mode_of_payment Link @@ -1068,7 +1080,7 @@ Net Total - 71 + 72 cash_bank_account Link @@ -1089,7 +1101,7 @@ Net Total - 72 + 73 column_break3 Column Break @@ -1101,7 +1113,7 @@ Net Total - 73 + 74 paid_amount Currency @@ -1115,7 +1127,7 @@ Net Total - 74 + 75 base_paid_amount Currency @@ -1129,7 +1141,7 @@ Net Total - 75 + 76 column_break4 Section Break @@ -1141,7 +1153,7 @@ Net Total - 76 + 77 write_off_amount Currency @@ -1155,7 +1167,7 @@ Net Total - 77 + 78 base_write_off_amount Currency @@ -1169,7 +1181,7 @@ Net Total - 78 + 79 write_off_outstanding_amount_automatically Check @@ -1181,7 +1193,7 @@ Net Total - 79 + 80 column_break_74 Column Break @@ -1193,7 +1205,7 @@ Net Total - 80 + 81 write_off_account Link @@ -1214,7 +1226,7 @@ Net Total - 81 + 82 write_off_cost_center Link @@ -1235,7 +1247,7 @@ Net Total - 82 + 83 terms_section_break Section Break @@ -1247,7 +1259,7 @@ Net Total - 83 + 84 tc_name Link @@ -1268,7 +1280,7 @@ Net Total - 84 + 85 terms Text Editor @@ -1280,7 +1292,7 @@ Net Total - 85 + 86 edit_printing_settings Section Break @@ -1292,7 +1304,7 @@ Net Total - 86 + 87 letter_head Link @@ -1313,7 +1325,7 @@ Net Total - 87 + 88 column_break_84 Column Break @@ -1325,7 +1337,7 @@ Net Total - 88 + 89 select_print_heading Link @@ -1346,7 +1358,7 @@ Net Total - 89 + 90 contact_section Section Break @@ -1360,7 +1372,7 @@ Net Total - 90 + 91 project_name Link @@ -1381,7 +1393,7 @@ Net Total - 91 + 92 territory Link @@ -1402,7 +1414,7 @@ Net Total - 92 + 93 customer_group Link @@ -1423,7 +1435,7 @@ Net Total - 93 + 94 col_break23 Column Break @@ -1435,7 +1447,7 @@ Net Total - 94 + 95 customer_address Link @@ -1456,7 +1468,7 @@ Net Total - 95 + 96 contact_person Link @@ -1477,7 +1489,7 @@ Net Total - 96 + 97 campaign Link @@ -1498,7 +1510,7 @@ Net Total - 97 + 98 source Select @@ -1521,7 +1533,7 @@ Campaign - 98 + 99 more_info Section Break @@ -1535,7 +1547,7 @@ Campaign - 99 + 100 debit_to Link @@ -1556,7 +1568,7 @@ Campaign - 100 + 101 party_account_currency Link @@ -1577,7 +1589,7 @@ Campaign - 101 + 102 is_opening Select @@ -1592,7 +1604,7 @@ Yes - 102 + 103 c_form_applicable Select @@ -1607,7 +1619,7 @@ Yes - 103 + 104 c_form_no Link @@ -1628,7 +1640,7 @@ Yes - 104 + 105 column_break8 Column Break @@ -1640,7 +1652,7 @@ Yes - 105 + 106 posting_time Time @@ -1652,7 +1664,7 @@ Yes - 106 + 107 fiscal_year Link @@ -1673,7 +1685,7 @@ Yes - 107 + 108 remarks Small Text @@ -1685,7 +1697,7 @@ Yes - 108 + 109 sales_team_section_break Section Break @@ -1699,7 +1711,7 @@ Yes - 109 + 110 sales_partner Link @@ -1720,7 +1732,7 @@ Yes - 110 + 111 column_break10 Column Break @@ -1732,7 +1744,7 @@ Yes - 111 + 112 commission_rate Float @@ -1744,7 +1756,7 @@ Yes - 112 + 113 total_commission Currency @@ -1758,7 +1770,7 @@ Yes - 113 + 114 section_break2 Section Break @@ -1770,7 +1782,7 @@ Yes - 114 + 115 sales_team Table @@ -1791,7 +1803,7 @@ Yes - 115 + 116 recurring_invoice Section Break @@ -1805,7 +1817,7 @@ Yes - 116 + 117 column_break11 Column Break @@ -1817,7 +1829,7 @@ Yes - 117 + 118 is_recurring Check @@ -1830,7 +1842,7 @@ Yes - 118 + 119 recurring_type Select @@ -1849,7 +1861,7 @@ Yearly - 119 + 120 from_date Date @@ -1862,7 +1874,7 @@ Yearly - 120 + 121 to_date Date @@ -1875,7 +1887,7 @@ Yearly - 121 + 122 repeat_on_day_of_month Int @@ -1888,7 +1900,7 @@ Yearly - 122 + 123 end_date Date @@ -1901,7 +1913,7 @@ Yearly - 123 + 124 column_break12 Column Break @@ -1913,7 +1925,7 @@ Yearly - 124 + 125 next_date Date @@ -1927,7 +1939,7 @@ Yearly - 125 + 126 recurring_id Data @@ -1940,7 +1952,7 @@ Yearly - 126 + 127 notification_email_address Small Text @@ -1953,7 +1965,7 @@ Yearly - 127 + 128 recurring_print_format Link @@ -1974,7 +1986,7 @@ Yearly - 128 + 129 against_income_account Small Text diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html index 0ca4863e51..dc502d159c 100644 --- a/erpnext/docs/current/models/buying/purchase_order.html +++ b/erpnext/docs/current/models/buying/purchase_order.html @@ -835,32 +835,6 @@ Net Total 55 - column_break_45 - - Column Break - - - - - - - - - 56 - discount_amount - - Currency - - Additional Discount Amount - - - - 
    currency
    - - - - - 57 base_discount_amount Currency @@ -873,8 +847,46 @@ Net Total - + + 56 + column_break_45 + + Column Break + + + + + + + + + 57 + additional_discount_percentage + + Float + + Additional Discount Percentage + + + + + + 58 + discount_amount + + Currency + + Additional Discount Amount + + + + 
    currency
    + + + + + 59 totals_section Section Break @@ -886,7 +898,7 @@ Net Total - 59 + 60 base_grand_total Currency @@ -900,7 +912,7 @@ Net Total - 60 + 61 base_in_words Data @@ -913,7 +925,7 @@ Net Total - 61 + 62 base_rounded_total Currency @@ -927,7 +939,7 @@ Net Total - 62 + 63 advance_paid Currency @@ -939,7 +951,7 @@ Net Total - 63 + 64 column_break4 Column Break @@ -951,7 +963,7 @@ Net Total - 64 + 65 grand_total Currency @@ -965,7 +977,7 @@ Net Total - 65 + 66 in_words Data @@ -977,7 +989,7 @@ Net Total - 66 + 67 terms_section_break Section Break @@ -991,7 +1003,7 @@ Net Total - 67 + 68 tc_name Link @@ -1012,7 +1024,7 @@ Net Total - 68 + 69 terms Text Editor @@ -1024,7 +1036,7 @@ Net Total - 69 + 70 contact_section Section Break @@ -1038,7 +1050,7 @@ Net Total - 70 + 71 supplier_address Link @@ -1059,7 +1071,7 @@ Net Total - 71 + 72 cb_contact Column Break @@ -1071,7 +1083,7 @@ Net Total - 72 + 73 contact_person Link @@ -1092,7 +1104,7 @@ Net Total - 73 + 74 more_info Section Break @@ -1104,7 +1116,7 @@ Net Total - 74 + 75 status Select @@ -1127,7 +1139,7 @@ Delivered - 75 + 76 fiscal_year Link @@ -1148,7 +1160,7 @@ Delivered - 76 + 77 ref_sq Data @@ -1160,7 +1172,7 @@ Delivered - 77 + 78 column_break_74 Column Break @@ -1172,7 +1184,7 @@ Delivered - 78 + 79 per_received Percent @@ -1184,7 +1196,7 @@ Delivered - 79 + 80 per_billed Percent @@ -1196,7 +1208,7 @@ Delivered - 80 + 81 column_break5 Section Break @@ -1208,7 +1220,7 @@ Delivered - 81 + 82 letter_head Link @@ -1229,7 +1241,7 @@ Delivered - 82 + 83 select_print_heading Link @@ -1250,7 +1262,7 @@ Delivered - 83 + 84 raw_material_details Section Break @@ -1264,7 +1276,7 @@ Delivered - 84 + 85 supplied_items Table @@ -1285,7 +1297,7 @@ Delivered - 85 + 86 recurring_order Section Break @@ -1299,7 +1311,7 @@ Delivered - 86 + 87 column_break Column Break @@ -1311,7 +1323,7 @@ Delivered - 87 + 88 is_recurring Check @@ -1323,7 +1335,7 @@ Delivered - 88 + 89 recurring_type Select @@ -1340,7 +1352,7 @@ Yearly - 89 + 90 from_date Date @@ -1353,7 +1365,7 @@ Yearly - 90 + 91 to_date Date @@ -1366,7 +1378,7 @@ Yearly - 91 + 92 repeat_on_day_of_month Int @@ -1379,7 +1391,7 @@ Yearly - 92 + 93 end_date Date @@ -1392,7 +1404,7 @@ Yearly - 93 + 94 column_break83 Column Break @@ -1404,7 +1416,7 @@ Yearly - 94 + 95 next_date Date @@ -1417,7 +1429,7 @@ Yearly - 95 + 96 recurring_id Data @@ -1429,7 +1441,7 @@ Yearly - 96 + 97 notification_email_address Small Text @@ -1442,7 +1454,7 @@ Yearly - 97 + 98 recurring_print_format Link diff --git a/erpnext/docs/current/models/buying/supplier_quotation.html b/erpnext/docs/current/models/buying/supplier_quotation.html index ebb63dfa6e..6938735d40 100644 --- a/erpnext/docs/current/models/buying/supplier_quotation.html +++ b/erpnext/docs/current/models/buying/supplier_quotation.html @@ -673,32 +673,6 @@ Net Total 44 - column_break_43 - - Column Break - - - - - - - - - 45 - discount_amount - - Currency - - Additional Discount Amount - - - - 
    currency
    - - - - - 46 base_discount_amount Currency @@ -711,8 +685,46 @@ Net Total - + + 45 + column_break_43 + + Column Break + + + + + + + + + 46 + additional_discount_percentage + + Float + + Additional Discount Percentage + + + + + + 47 + discount_amount + + Currency + + Additional Discount Amount + + + + 
    currency
    + + + + + 48 section_break_46 Section Break @@ -724,7 +736,7 @@ Net Total - 48 + 49 base_grand_total Currency @@ -738,7 +750,7 @@ Net Total - 49 + 50 base_in_words Data @@ -750,7 +762,7 @@ Net Total - 50 + 51 base_rounded_total Currency @@ -764,7 +776,7 @@ Net Total - 51 + 52 column_break4 Column Break @@ -776,7 +788,7 @@ Net Total - 52 + 53 grand_total Currency @@ -790,7 +802,7 @@ Net Total - 53 + 54 in_words Data @@ -802,7 +814,7 @@ Net Total - 54 + 55 terms_section_break Section Break @@ -816,7 +828,7 @@ Net Total - 55 + 56 tc_name Link @@ -837,7 +849,7 @@ Net Total - 56 + 57 terms Text Editor @@ -849,7 +861,7 @@ Net Total - 57 + 58 contact_section Section Break @@ -863,7 +875,7 @@ Net Total - 58 + 59 supplier_address Link @@ -884,7 +896,7 @@ Net Total - 59 + 60 contact_person Link @@ -905,7 +917,7 @@ Net Total - 60 + 61 printing_settings Section Break @@ -917,7 +929,7 @@ Net Total - 61 + 62 select_print_heading Link @@ -938,7 +950,7 @@ Net Total - 62 + 63 letter_head Link @@ -959,7 +971,7 @@ Net Total - 63 + 64 more_info Section Break @@ -973,7 +985,7 @@ Net Total - 64 + 65 status Select @@ -991,7 +1003,7 @@ Cancelled - 65 + 66 is_subcontracted Select @@ -1007,7 +1019,7 @@ No - 66 + 67 column_break_57 Column Break @@ -1019,7 +1031,7 @@ No - 67 + 68 fiscal_year Link diff --git a/erpnext/docs/current/models/hr/department.html b/erpnext/docs/current/models/hr/department.html index 4f0ffefde1..5705451067 100644 --- a/erpnext/docs/current/models/hr/department.html +++ b/erpnext/docs/current/models/hr/department.html @@ -106,6 +106,8 @@ +

    Customization

    diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt index 365a5029ec..b9f567d21a 100644 --- a/erpnext/docs/user/videos/learn/index.txt +++ b/erpnext/docs/user/videos/learn/index.txt @@ -37,4 +37,6 @@ workflow advance-payments drop-ship file-manager -publish-items-on-website \ No newline at end of file +publish-items-on-website +shopping-cart +report-builder \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/publish-items-on-website.md b/erpnext/docs/user/videos/learn/publish-items-on-website.md index eb77e46a12..0028b3fa75 100644 --- a/erpnext/docs/user/videos/learn/publish-items-on-website.md +++ b/erpnext/docs/user/videos/learn/publish-items-on-website.md @@ -1,4 +1,4 @@ -# Publish Item on Website +# Publish Items on Website diff --git a/erpnext/docs/user/videos/learn/report-builder.md b/erpnext/docs/user/videos/learn/report-builder.md new file mode 100644 index 0000000000..72fdc254af --- /dev/null +++ b/erpnext/docs/user/videos/learn/report-builder.md @@ -0,0 +1,7 @@ +# Report Builder + + + +**Duration: 4:27** + +This tutorial covers creating custom reports in ERPNext using Report Builder. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/shopping-cart.md b/erpnext/docs/user/videos/learn/shopping-cart.md new file mode 100644 index 0000000000..c0dfbe6e0c --- /dev/null +++ b/erpnext/docs/user/videos/learn/shopping-cart.md @@ -0,0 +1,7 @@ +# Shopping Cart + + + +**Duration: 6:32** + +ERPNext has Customers Portal. It allos Customer to login, and place new orderes using shopping cart. From Customer Portal, customer can also track progress on their existing orders, view history of transactions and communicate via Issues. \ No newline at end of file