Himanshu Warekar
523d0ab0d4
fix: resolution by indicator
2019-07-11 13:24:28 +05:30
Suraj Shetty
bc2ff785f1
fix: Restore "allow delivery" condition checks ( #18246 )
...
* fix: Remove `allow_delivery` flag
- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated
* fix: Restore allow_delivery condition checks
2019-07-11 10:43:40 +05:30
Suraj Shetty
c6c6b05522
fix: update_due_date_in_gle patch ( #18248 )
2019-07-11 10:42:37 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart
2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f
fix(sales-invoice): get items from quotation ( #18237 )
2019-07-11 10:04:46 +05:30
rohitwaghchaure
4870e95b83
fix: po, rate set as zero against the item ( #18242 )
2019-07-11 10:03:35 +05:30
deepeshgarg007
285701d9f1
fix: Add missing Cost Center filter in cash flow statement
2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f
feat: added chart to cash-flow report
2019-07-10 20:28:52 +05:30
Suraj Shetty
7391054603
Merge branch 'develop' into breadcrumbs-module-map-2
2019-07-10 19:39:56 +05:30
Suraj Shetty
7837fbe231
style: Add missing semicolon
2019-07-10 19:39:40 +05:30
Mangesh-Khairnar
d749f20f63
fix: installation note ( #18232 )
2019-07-10 19:29:39 +05:30
Faris Ansari
a7a6987c42
fix: Add Shopping Cart and Contacts
2019-07-10 19:27:57 +05:30
Faris Ansari
ab46f0f5bb
fix: Add module map for breadcrumbs
2019-07-10 19:27:44 +05:30
Don-Leopardo
365a572073
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-10 10:52:59 -03:00
Don-Leopardo
93fbba4f40
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-07-10 10:52:55 -03:00
Himanshu
e7bb54ed76
feat(Issue): Settings to stop SLA tracking ( #18112 )
...
* fix: fix msgprint when creating new issues
* fix: use getdate
* fix: do not self save
* fix: test case
* fix: error due to comparing date and str
* fix: creation time for replicated issue
* feat: sla in support settings
* fix: remove sla settings
* feat: enable check in sla
* fix: throw if sla is disabled
* fix: enable sla
2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347
fix: Make material request against SO only for pending qty ( #18216 )
2019-07-10 17:05:49 +05:30
Suraj Shetty
61d8088be4
fix: Return fieldtype so that the client-side can format chart values ( #18211 )
2019-07-10 17:05:25 +05:30
rohitwaghchaure
058787d204
fix: error report for item price ( #18212 )
2019-07-10 17:03:48 +05:30
Mangesh-Khairnar
3d28c065db
fix(exchange-rate-revaluation): change create to view button on creation of journal entry ( #18201 )
2019-07-10 17:03:23 +05:30
deepeshgarg007
1dc124cf75
fix: Changed columns to new dict form
2019-07-10 14:49:25 +05:30
Rucha Mahabal
191a0bd43c
merged
2019-07-10 12:27:13 +05:30
Suraj Shetty
838697261d
fix: Call popup avatar
...
Avoid getting session users image if customer doc has no image
2019-07-10 10:39:43 +05:30
Shivam Mishra
eb7c037bdf
Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary
2019-07-10 10:22:20 +05:30
Shivam Mishra
444091b350
refactor: disable quick entry for batched and serialized items
2019-07-10 10:22:08 +05:30
Deepesh Garg
62911ec198
Merge pull request #18206 from Anurag810/sending_sms_from_quotation
...
fix: sending sms from quotation
2019-07-10 09:18:43 +05:30
Anurag Mishra
e9dd9b842e
Update erpnext/public/js/sms_manager.js
...
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-07-09 17:54:00 +05:30
deepeshgarg007
890ea195f3
fix: Tree filter fixes for erpnext dimensions
2019-07-09 16:56:56 +05:30
Rucha Mahabal
8c747ce5cf
merged
2019-07-09 15:18:45 +05:30
Rucha Mahabal
36963a8e04
feat: Email Campaign
2019-07-09 15:14:13 +05:30
Anurag Mishra
de13faf19a
fix: sending sms from quotation
2019-07-09 14:27:20 +05:30
Raffael Meyer
59cee369ce
add header row
2019-07-08 14:48:54 +02:00
Mangesh-Khairnar
6a7969117f
fix(bom): escape name with wildcard character ( #18164 )
2019-07-08 10:40:40 +05:30
Rushabh Mehta
8309fcfbbc
BREAKING CHANGE: Remove anti-pattern "Project Task" ( #18059 )
...
* BREAKING CHANGE: Remove anti-pattern "Project Task"
* fix(tests): remove `tasks` from project/test_records.json
* fix(tests)
* fix(test): test_employee_onboarding.py
* fix(tests): test_expense_claim.py
* fix(refactor): cleanup project.py validate/update
* fix(refactor): cleanup project.py validate/update
* fix(test): test_expense_claim
* fix(test): test_expense_claim
* fix(test): test_expense_claim, try Test Company 4
* Update project.py
2019-07-08 10:39:30 +05:30
Suraj Shetty
bef897602d
fix: Use db_set since it triggers on_update event ( #18175 )
2019-07-08 10:30:26 +05:30
rohitwaghchaure
d86f027ce0
fix: default supplier was not set from the patch in item defaults for multi company instance ( #18178 )
2019-07-08 10:29:26 +05:30
rohitwaghchaure
334335a2ef
fix: not able to make credit note for the sales invoice in which item code is not set ( #18184 )
2019-07-08 10:26:29 +05:30
Himanshu
35f15148fb
fix: do not update modified ( #18193 )
2019-07-08 10:25:28 +05:30
Deepesh Garg
f753191fdf
Merge pull request #18195 from deepeshgarg007/b2cs_json
...
fix: GSTR-1 B2CS JSON file generation and cess amount fixes
2019-07-08 10:10:52 +05:30
Deepesh Garg
6252c0490a
Merge pull request #18194 from deepeshgarg007/dimensions_reports
...
fix: Add accounting dimensions to various reports and fixes
2019-07-07 22:40:57 +05:30
deepeshgarg007
6bb5ade667
fix: Add accounting dimensions to various reports and fixes
2019-07-07 21:24:45 +05:30
Mangesh-Khairnar
48d61fb072
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored
2019-07-07 20:17:07 +05:30
deepeshgarg007
7ce199807c
fix: GSTR-1 B2CS Json file generation and cess amount fixes
2019-07-07 14:25:08 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
...
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
Bhavishya Sharma
607611ebdc
codacy fix
2019-07-06 15:02:57 +05:30
Bhavishya Sharma
db3c5625ae
feat: Manufacturer is Missing Contacts
2019-07-06 13:54:30 +05:30
rohitwaghchaure
94b3dd1db2
Merge pull request #18154 from netchampfaris/fix-price-list-on-website-d
...
fix: Honor price list in Shopping Cart Settings
2019-07-05 18:14:45 +05:30
rohitwaghchaure
6b2075a115
Merge pull request #18161 from deepeshgarg007/additional_discount
...
fix: Additonal discount not getting set in sales transactions
2019-07-05 18:13:23 +05:30
rohitwaghchaure
6ea1f7becf
Merge pull request #18177 from scmmishra/po-patch-1
...
refactor: added throw if supplier is not default for any item
2019-07-05 18:12:56 +05:30
rohitwaghchaure
d8196ced76
Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
...
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 17:28:50 +05:30
Rohit Waghchaure
5d4d70b75f
feat: provision to make debit / credit note against the stock returned entry
2019-07-05 17:06:25 +05:30
Deepesh Garg
1640e7012b
Merge pull request #18172 from karthikeyan5/develop-terms-selling-buying-filter
...
feat(setup): adding selling buying filter in terms and conditions
2019-07-05 16:03:16 +05:30
Shivam Mishra
6277966105
chore: added check for auto-reorder in stock settings ( #18174 )
...
* chore: added check for auto-reorder in stock settings
* style: removed explicit return
2019-07-05 15:58:13 +05:30
Mangesh-Khairnar
ee01ba5879
fix: linting
2019-07-05 15:21:45 +05:30
Rohit Waghchaure
909d773462
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 15:12:14 +05:30
Rohit Waghchaure
0f065d5de1
Added due date in the gl entry
2019-07-05 14:54:15 +05:30
Rohit Waghchaure
2f3f7507c4
fix: browser hangs while making payment entry for large number of outstaning invoices
2019-07-05 14:38:46 +05:30
Suraj Shetty
83f767b5a3
Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards
...
feat(manufacturing): added dashboard for doctypes
2019-07-05 14:22:13 +05:30
Govind S Menokee
473a5477b6
Merge pull request #3 from kaynes-technology/develop
...
Merge develop
2019-07-05 13:33:25 +05:30
Shivam Mishra
7a7c66e95e
refactor: added throw if supplier is not default for any item
2019-07-05 13:06:53 +05:30
karthikeyan5
82e2bac891
fix(coding style): adding a few spaces
2019-07-05 12:41:19 +05:30
Rohit Waghchaure
cdb75b56c5
fix: removed item manaufacturer child table from item master
2019-07-05 12:24:14 +05:30
karthikeyan5
ad33c19510
fix: converting spaces to tabs on a few lines
2019-07-05 11:28:59 +05:30
Shivam Mishra
38b930b638
refactor: Move and Add buttons open new stock entry
2019-07-05 10:38:48 +05:30
karthikeyan5
830f2b642b
chore(manufacturing): added dashboard for doctypes
2019-07-05 09:48:38 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
rohitwaghchaure
2f67fb25a6
Merge pull request #18168 from netchampfaris/stock-validation-message
...
fix: Add links in validation message
2019-07-04 19:13:08 +05:30
rohitwaghchaure
03db4c0efc
Merge pull request #18166 from netchampfaris/send-sms-bom
...
fix: Don't show Send SMS in BOM
2019-07-04 19:11:42 +05:30
rohitwaghchaure
c1535a5542
Merge pull request #18167 from netchampfaris/manufacturing-module-sections
...
fix(UX): Move Bill of Materials section to first
2019-07-04 19:11:08 +05:30
Faris Ansari
23c80658ba
fix: Add links in validation message
2019-07-04 18:54:04 +05:30
Faris Ansari
2b969a469a
fix: Build item cache in long worker ( #18165 )
2019-07-04 18:52:32 +05:30
Faris Ansari
1d3008750c
fix(UX): Move Bill of Materials section to first
2019-07-04 17:53:10 +05:30
Faris Ansari
a5d975d867
fix: Don't show Send SMS in BOM
2019-07-04 17:47:28 +05:30
deepeshgarg007
a9ea49c976
fix: Additonal discount not get set in sales transactions
2019-07-04 15:56:34 +05:30
Shivam Mishra
e528b29eea
Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary
2019-07-04 13:46:30 +05:30
Mangesh-Khairnar
29734dae18
patch: reloads newly created docs in v12 ( #18148 )
2019-07-04 12:50:16 +05:30
Mangesh-Khairnar
100af0a635
fix(salary-slip): Nonetype error on amount calculation ( #18147 )
...
* fix: amount calculation
* Update salary_slip.py
2019-07-04 12:29:26 +05:30
Anurag Mishra
bdec7fea82
feat: purchase order against sales order ( #17975 )
...
* feat: purchase order against sales order
* fix: remove unwanted checks
* fix:Related tests
2019-07-04 12:28:01 +05:30
Nabin Hait
7b684a01d3
fix: merge conflict
2019-07-04 12:06:50 +05:30
Mangesh-Khairnar
359a73e1aa
fix: invoice cancellation ( #18152 )
2019-07-04 11:37:20 +05:30
rohitwaghchaure
ca9d13cc9b
Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop
...
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-04 00:48:57 +05:30
Deepesh Garg
a37c51f93e
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
...
fix: Add filters for accounting dimensions in trial balance report
2019-07-03 22:00:25 +05:30
rohitwaghchaure
465196b0c7
Merge pull request #18155 from scmmishra/accounts-rec-report
...
fix: format values for charts
2019-07-03 19:26:08 +05:30
Faris Ansari
76afcf4cba
fix: Honor price list in Shopping Cart Settings
2019-07-03 19:23:12 +05:30
Shivam Mishra
bb02c5105e
fix: format values for charts
2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a
fix: Add filtesr for accounting dimensions in trial balance report
2019-07-03 18:08:41 +05:30
Deepesh Garg
e5f8d24ead
Merge pull request #18034 from rohitwaghchaure/payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
...
feat: payment reconciliation enhancements
2019-07-03 17:46:00 +05:30
Shivam Mishra
7dedd9a8cd
refactor: better error message when changing variant value ( #18144 )
2019-07-03 17:29:29 +05:30
Don-Leopardo
85e2fd965a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-03 08:15:08 -03:00
Deepesh Garg
af4f7b4ea1
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 16:31:48 +05:30
Deepesh Garg
55fbddbee6
Add missing semicolon
2019-07-03 16:31:06 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Deepesh Garg
824ad34270
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 13:28:49 +05:30
Deepesh Garg
8929c62113
Merge pull request #18145 from deepeshgarg007/gstr-itc-rev
...
fix: Multiple fixes in GSTR-3b Report
2019-07-03 13:11:14 +05:30
Mangesh-Khairnar
80fb0bf520
fix: add employee leave balance report to the dashboard
2019-07-03 13:06:46 +05:30
Deepesh Garg
0891728705
Merge pull request #18142 from frappe/surajshetty3416-patch-1
...
refactor: Remove an unwanted debug flag
2019-07-03 12:18:30 +05:30
Mangesh-Khairnar
8d19faa598
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-07-03 11:44:00 +05:30
rohitwaghchaure
f078031c60
fix: multiple minor issues in delayed order report ( #18134 )
2019-07-03 11:43:38 +05:30
Mangesh-Khairnar
0d4db95d99
fix: skip expired leaves on allocation end date
2019-07-03 11:35:51 +05:30
Deepesh Garg
1a6bfe986e
Merge pull request #18113 from deepeshgarg007/gstr1-total
...
fix: Add total row in GSTR-1 report
2019-07-03 11:12:43 +05:30
Suraj Shetty
247d50e552
refactor: Remove unwanted debug flag
2019-07-03 10:47:35 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Don-Leopardo
46b21f88e1
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-02 14:03:45 -03:00
deepeshgarg007
723e76f2ac
fix: fix for test test_contact_search_in_foreign_language
2019-07-02 21:01:57 +05:30
Deepesh Garg
f866020f26
Merge branch 'develop' into gstr1-total
2019-07-02 19:59:53 +05:30
deepeshgarg007
3a83c7bd7d
fix: Multiple fixes in GSTR-3b Report
2019-07-02 19:56:33 +05:30
Nabin Hait
05fee62314
fix: inv status
2019-07-02 17:55:26 +05:30
Nabin Hait
3bbcd491e4
fix: set invoice status considering invoice discounting
2019-07-02 15:31:24 +05:30
Nabin Hait
126a02e208
fix: set invoice status considering invoice discounting
2019-07-02 15:28:57 +05:30
Rohit Waghchaure
09b44345df
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-02 15:18:02 +05:30
Frappe PR Bot
f773c8e8a3
feat: Updated translation ( #18125 )
2019-07-02 10:14:53 +05:30
Mangesh-Khairnar
98409159c8
Merge pull request #18120 from Mangesh-Khairnar/fix-leaderboard
...
fix: leaderboard charts
2019-07-02 10:13:15 +05:30
Deepesh Garg
78a86af7fd
fix: Fiter passing fix in get batch query ( #18131 )
2019-07-02 10:10:55 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
...
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-01 20:47:35 +05:30
Aditya Hase
8d70073cf8
refactor: Remove implicit auto assignment feature ( #18124 )
...
This behaviour now can be replicated with Assignment Rule configurations.
2019-07-01 19:35:17 +05:30
Mangesh-Khairnar
fc3731f15e
Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix
...
fix: clear duplicates in mapped doc
2019-07-01 17:04:12 +05:30
Faris Ansari
8d2c996b50
feat: Call Popup and Exotel Integration ( #17763 )
...
feat: Call Popup and Exotel Integration
2019-07-01 16:36:32 +05:30
Shivam Mishra
43cebdff4d
fix: translated title ( #18119 )
2019-07-01 11:01:28 +00:00
Nabin Hait
659a01d819
Update accounts_controller.py
2019-07-01 15:16:49 +05:30
Deepesh Garg
71359cc18b
Merge branch 'develop' into gstr1-total
2019-07-01 14:49:59 +05:30
Suraj Shetty
8e65d5bd5b
chore: Delete unwanted files
2019-07-01 14:32:29 +05:30
Suraj Shetty
b2e321686d
Merge branch 'develop' into call-summary-dialog
2019-07-01 14:29:49 +05:30
Suraj Shetty
56242a5077
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-07-01 14:29:05 +05:30
Suraj Shetty
502565ff56
fix: Make required changes
2019-07-01 14:28:59 +05:30
Mangesh-Khairnar
4aed7cc310
Merge branch 'develop' into mapped_doc_fix
2019-07-01 13:40:52 +05:30
rohitwaghchaure
c77bd82083
Merge pull request #18118 from rohitwaghchaure/asset_staus_not_showing_in_the_listview
...
fix: asset status not showing in the list view
2019-07-01 13:32:39 +05:30
Deepesh Garg
0cdf55033a
Merge branch 'develop' into gstr1-total
2019-07-01 12:36:35 +05:30
Rohit Waghchaure
7729fcea19
fix: asset status not shwoing in the list view
2019-07-01 12:26:34 +05:30
Mangesh-Khairnar
9955b189e4
fix: leaderboard chart
2019-07-01 12:20:09 +05:30
Rohit Waghchaure
2fa6224f8f
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 11:55:12 +05:30
Suraj Shetty
edee06fc90
Merge branch 'develop' into call-summary-dialog
2019-07-01 11:05:59 +05:30
Himanshu
2d0fd9f519
fix: travis ( #18116 )
2019-07-01 10:24:02 +05:30
Suraj Shetty
1431bf2a3c
fix: User cannot create call log
2019-07-01 09:10:23 +05:30
Rucha Mahabal
162f7d1b50
auto email and new communication linked to email campaign setup
2019-07-01 01:09:58 +05:30
deepeshgarg007
cef54ae3c2
fix: Add total row in GSTR-1 report
2019-06-30 19:49:26 +05:30
Rucha Mahabal
dcf5fbd35d
added some validations
2019-06-30 16:36:09 +05:30
Rucha Mahabal
fc03509e46
created data structure for email automation
2019-06-30 16:24:29 +05:30
Suraj Shetty
19e4fde737
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-06-30 15:30:59 +05:30
rohitwaghchaure
4c2eb0f13b
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
...
fix: finance book filters includes the gl data which don't have finance book
2019-06-29 15:06:34 +05:30
rohitwaghchaure
ada1e4f0c4
Merge pull request #17962 from rohitwaghchaure/not_able_to_save_asset_for_manual_method_develop
...
fix: not able to save asset if depreciation method is manual
2019-06-29 15:05:46 +05:30
Govind S Menokee
a596a7fd2b
feat: Add batch operation times in BOM Operation
2019-06-29 04:08:26 +05:30
Don-Leopardo
b2b5c3ac0a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-28 19:36:25 -03:00
Himanshu Warekar
115da67713
fix: include standalone sla in issues
2019-06-28 22:26:58 +05:30
Himanshu
a917bec8da
Merge branch 'develop' into mapped_doc_fix
2019-06-28 19:46:00 +05:30
Himanshu Warekar
bc0bc6677e
fix: use db sql to delete property setter
2019-06-28 19:41:29 +05:30
Mangesh-Khairnar
e493490702
fix: mapped doc
2019-06-28 19:22:51 +05:30
Himanshu Warekar
c163b0de3d
Merge branch 'develop' of https://github.com/frappe/erpnext into issue-fix
2019-06-28 19:08:08 +05:30
Himanshu Warekar
5cec89d1ab
fix: remove frm call for priority change
2019-06-28 19:07:13 +05:30
rohitwaghchaure
42c8a4baa0
Merge pull request #18102 from adityahase/fix-buying-develop
...
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
2019-06-28 14:44:21 +05:30
Aditya Hase
d825ee57b7
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
2019-06-28 14:40:59 +05:30
Himanshu
ea4c42d47b
fix(Utils): Do not add duplicate items ( #17896 )
...
* fix: do not add duplicate items
* Update erpnext/public/js/utils.js
Co-Authored-By: Rohan <Alchez@users.noreply.github.com>
* fix: compare warehouses, batch and qty for an item
* fix: code fixes
* Update utils.js
* fix: check required_date and delivery_date
* Update utils.js
* fix: mixed tabs and spaces
2019-06-28 14:13:13 +05:30
Deepesh Garg
fb29ffc90c
fix: Usability fixes to Serial No and batch selector ( #18071 )
...
* fix: Usability fixes to Serial No and batch selector
* fix: Codacy
* Update sales_common.js
2019-06-28 14:08:08 +05:30
Frappe PR Bot
a15d100cbd
feat: Updated translation ( #17954 )
2019-06-28 13:05:19 +05:30
KanchanChauhan
2433fb1596
feat: Terms and Conditions section in Blanket Order ( #17991 )
2019-06-28 12:54:12 +05:30
Deepesh Garg
dbe9a41389
feat: Confirmation to submit material request against Production Plan ( #18062 )
...
* feat: Confirmation to submit material request against Production Plan
* fix: Test cases for production plan
* fix: Test Cases for production plan
2019-06-28 12:48:28 +05:30
Nabin Hait
f5aff98589
fix: Validate changes in batch, serial nos, val method fields ( #18064 )
2019-06-28 12:47:44 +05:30
Karthikeyan S
e6236094a6
fix(item): fix patch for barcode childtable migration in item ( #18069 )
...
* fix(item): fix patch for barcode childtable migration in item
(cherry picked from commit b2c43ee2d91599038f7bdf2038bbc4c4e7b36285)
* fix(item): fixing broken patch item_barcode_childtable_migrate
(cherry picked from commit beca677276e0b5b143cd6d1d08efa8529663f60c)
2019-06-28 12:46:42 +05:30
rohitwaghchaure
9dd7d3ebb3
fix: not able to make salary slip based on timesheet ( #18088 )
2019-06-28 12:40:52 +05:30
Mangesh-Khairnar
4000fb5bb8
fix: add a more descriptive message when no records are found ( #18082 )
...
* fix: add a more descriptive message when no records are found
* fix: translation by passing string to translation function
2019-06-28 12:38:40 +05:30
Don-Leopardo
c3f6bed650
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-27 18:09:19 -03:00
Don-Leopardo
a01d0a5311
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-27 18:09:09 -03:00
Himanshu Warekar
43e3dacba2
fix: remove whitelisted method
2019-06-28 00:00:48 +05:30
Himanshu Warekar
be0001ece6
fix: change to link field
2019-06-27 22:59:52 +05:30
Aditya Hase
ce9cdfb056
fix(ui): better message after creating serial numbers ( #18093 )
...
fix(ui): better message after creating serial numbers
2019-06-27 18:20:13 +05:30
Aditya Hase
7f3ebb1d06
Merge branch 'develop' into stock-ledger-link
2019-06-27 18:19:15 +05:30
Aditya Hase
b9c9ada3f8
Merge pull request #18090 from scmmishra/twelve-fixes
...
fix: print message for insufficient stock
2019-06-27 18:18:24 +05:30
Aditya Hase
a10912787c
fix: styling for sort selector ( #18092 )
...
fix: styling for sort selector
2019-06-27 18:17:35 +05:30
Anurag Mishra
322eca61e6
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
...
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
2019-06-27 17:00:55 +05:30
Shivam Mishra
c41403c8a9
fix: remove move and add buttons from stock summary
2019-06-27 16:34:38 +05:30
Shivam Mishra
0ec772194d
Merge branch 'develop' into page-sort-selector
2019-06-27 15:38:18 +05:30
Shivam Mishra
eeeccdb6da
Merge branch 'develop' into twelve-fixes
2019-06-27 15:37:58 +05:30
Shivam Mishra
0f67d22edd
Merge branch 'develop' into stock-ledger-link
2019-06-27 15:37:44 +05:30
Rushabh Mehta
09fed465fb
Merge pull request #18081 from Mangesh-Khairnar/fix-department
...
fix: open department in tree view via awesome bar
2019-06-27 15:02:53 +05:30
Shivam Mishra
468d5563c6
fix: set serial numbers as data field
2019-06-27 14:13:54 +05:30
Shivam Mishra
e1aec5519b
fix(ui): better message after creating serial numbers
2019-06-27 13:14:41 +05:30
Shivam Mishra
bc777b1732
fix: styling for sort selector
2019-06-27 12:43:39 +05:30
Mangesh-Khairnar
3b60fac3b7
fix: open department in tree view via awesome bar
2019-06-27 11:43:22 +05:30
Shivam Mishra
9e07b7d2b8
Merge branch 'develop' into twelve-fixes
2019-06-27 09:44:41 +05:30
Himanshu Warekar
5ebdf76669
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-27 01:29:25 +05:30
Himanshu Warekar
24b9d1e5a6
fix: patch fixes
2019-06-27 01:29:00 +05:30
Himanshu
6596f6e218
Merge branch 'develop' into sla_fix
2019-06-27 00:18:56 +05:30
Rohit Waghchaure
6de3ed5416
fix: dn test cases
2019-06-26 21:58:42 +05:30
Himanshu
27c1e844c7
Merge branch 'develop' into sla_fix
2019-06-26 18:24:29 +05:30
Faris Ansari
50644b5315
fix: Allow Rename in Issue Type ( #18079 )
...
fix: Allow Rename in Issue Type
2019-06-26 17:51:30 +05:30
Faris Ansari
df7a6520b9
fix: Allow Rename in Issue Type
2019-06-26 16:57:33 +05:30
Himanshu
b134709aaf
Merge branch 'develop' into sla_fix
2019-06-26 16:36:51 +05:30
Karthikeyan S
48535e95e6
Fix(integrations): Adding Error Logs for Woocommerce ( #18061 )
...
(cherry picked from commit ae255d6328b70b148d28d9a88a695932656bf276)
2019-06-26 13:41:49 +05:30
rohitwaghchaure
387ee8f511
fix: returned qty issue while making sales invoice from dn if same item added multiple times ( #18076 )
2019-06-26 13:40:26 +05:30
Rushabh Mehta
b8b506b105
Merge pull request #18072 from hrwX/att_gantt_fix_v12
...
fix(Attendance): Attendance gantt fix
2019-06-26 13:36:37 +05:30
Faris Ansari
2ab8d3ebcc
fix: Move links to appropriate section ( #17999 )
...
* fix: Move links to appropriate section
* fix: New section Accounting Entries
2019-06-26 13:32:41 +05:30
Faris Ansari
fbc861320f
fix: Don't append None values in against_account ( #18031 )
2019-06-26 13:31:31 +05:30
Anurag Mishra
0181eb0652
fix: removed unused function
2019-06-26 13:26:50 +05:30
Anurag Mishra
8a6255078b
fix: wrong Casual Leave opening
2019-06-26 13:22:34 +05:30
Himanshu
9323c3ae29
Merge branch 'develop' into sla_fix
2019-06-26 12:54:08 +05:30
Himanshu Warekar
d48b2ac126
fix: attendance gantt fix
2019-06-26 11:37:49 +05:30
Mangesh-Khairnar
8c621ab90c
fix: precision for certain calculations in buying controller ( #18008 )
...
* fix: precision for certain numbers
* fix: check precision of the received_qty
* Update buying_controller.py
2019-06-26 11:10:17 +05:30
Deepesh Garg
ea0574679f
fix: Removed submitted status from Quotation ( #18055 )
...
* fix: Change in list view and status updater
* fix: Change status in doctype
* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Mangesh-Khairnar
07aae76bbf
fix: change the department to tree view ( #18057 )
2019-06-26 11:03:57 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Shivam Mishra
9479f7f1ef
fix: print message for insufficient stock
2019-06-26 10:37:00 +05:30
rohitwaghchaure
b98e825ceb
Merge pull request #18060 from adityahase/fix-sales-funnel
...
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 21:36:26 +05:30
Himanshu
bd3ccad513
Merge branch 'develop' into sla_fix
2019-06-25 21:14:52 +05:30
Aditya Hase
2caaa1b03d
fix(sales-funnel): Remove duplicate code
2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 17:07:41 +05:30
rohitwaghchaure
2b6cb6160f
Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant
...
fix: Closed job opening disaplying in job applicant
2019-06-25 16:51:03 +05:30
Himanshu Warekar
6931ea68a2
Merge sla_fix into sla_fix
2019-06-25 16:27:58 +05:30
Himanshu Warekar
2373c095ed
Merge develop into sla_fix
2019-06-25 16:27:06 +05:30
Himanshu Warekar
99d46844d5
fix: minor patch fix
2019-06-25 16:25:51 +05:30
rohitwaghchaure
f9de144f07
Merge pull request #18045 from deepeshgarg007/accounts_controller_develop
...
fix: Float division by zero error handling in group similar item
2019-06-25 15:25:42 +05:30
rohitwaghchaure
827ac1e291
Merge pull request #18040 from Mangesh-Khairnar/fix-price-list
...
fix(price list): change the field name
2019-06-25 15:23:44 +05:30
rohitwaghchaure
8aff023abe
Merge pull request #18049 from deepeshgarg007/rounded_total_develop
...
fix: Currency symbol fix for rounded total
2019-06-25 15:14:34 +05:30
sahil28297
b056595029
Merge branch 'develop' into fix_bom_exploded_item
2019-06-25 14:12:23 +05:30
Deepesh Garg
cc0bebacd2
Merge branch 'develop' into accounts_controller_develop
2019-06-25 13:15:42 +05:30
Himanshu
ce7603acc5
Merge branch 'develop' into sla_fix
2019-06-25 11:48:41 +05:30
Rohit Waghchaure
a64e4037d2
fix: revert changes of bom recursion
2019-06-25 07:08:59 +05:30
deepeshgarg007
ab13192dd4
fix: Currency symbol fix for rounded total
2019-06-24 21:22:52 +05:30
Don-Leopardo
fb2a05cb3f
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-24 11:29:28 -03:00
Don-Leopardo
54b9fd5bef
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-24 11:29:23 -03:00
Himanshu
0e26deb463
Merge branch 'develop' into sla_fix
2019-06-24 19:30:36 +05:30
deepeshgarg007
e8d21cd8fa
fix: Division by zero error fix in group similar item
2019-06-24 18:49:24 +05:30
Rohit Waghchaure
78d6086739
fix: Closed job opening disaplying in job applicant
2019-06-24 18:05:10 +05:30
rohitwaghchaure
55c9eb6d9e
Merge pull request #18037 from rohitwaghchaure/bom_update_tool_optimization
...
fix: optimize bom update tool
2019-06-24 18:00:17 +05:30
Mangesh-Khairnar
558a5c199f
fix(price list): change the field name
2019-06-24 17:32:04 +05:30
NahuelOperto
42fe68d065
feat: order type in trr type filter
2019-06-24 08:29:14 -03:00
Himanshu Warekar
4538658d02
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-24 15:22:25 +05:30
Himanshu Warekar
54ece39aef
fix: review changes
2019-06-24 15:18:56 +05:30
karthikeyan5
eadc144477
fix(HR): fixing bug introduced during merge conflict resolution.
...
> while merging with https://github.com/frappe/erpnext/pull/17837
2019-06-24 15:15:38 +05:30
karthikeyan5
82256bc58b
fix(hr): Auto Attendance
...
> fixing minor bug in shift calculation
> adding 'Mark Auto Attendance' button in shift and related fixes
> changed employee checkin naming series
> added aditional validation for employee checkin
> added/updated dashboard for Attendance, Employee, Shift Type
2019-06-24 15:15:38 +05:30
karthikeyan5
32197355ad
rename(HR): Employee Attendance Log DocType to Employee Checkin
2019-06-24 15:15:38 +05:30
karthikeyan5
e0c5176383
refactor(HR): Auto Attendance
...
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
2019-06-24 15:15:38 +05:30
karthikeyan5
66e459b35d
fix(auto attendance): changes as requested in review
...
> removed unused field from shift assignment
> renamed 'biometric_rf_id' to 'attendance_device_id'
> added more test cases
> few other minor changes after demo
2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8
feat(HR): Auto Attendance
...
>Marking attendance based on Employee Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542
fix(HR): validations and bug fixes for Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
a4d0ba222b
fix(HR): changes as per PR review
...
> renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType
> renamed biometric_id to biometric_rf_if
2019-06-24 15:15:38 +05:30
karthikeyan5
e4bbda6ff5
feat(HR): Added Employee CheckIn Log
...
> Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices.
>added biometric_id in the Employee Doctype
2019-06-24 15:15:38 +05:30
Rohit Waghchaure
1777e60dc2
fix: test case for payment terms in quotation
2019-06-24 14:11:06 +05:30
Rohit Waghchaure
d95909c39a
fix: optimize bom update tool
2019-06-24 12:57:44 +05:30
Rohit Waghchaure
a2408a63da
feat: payment reconciliation enhancements
2019-06-24 02:11:51 +05:30
Himanshu Warekar
3780508ec5
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-24 00:33:01 +05:30
Himanshu Warekar
de8c38f0fe
fix: datetime import
2019-06-24 00:31:33 +05:30
Himanshu
3ec19b7afa
Merge branch 'develop' into sla_fix
2019-06-23 23:22:53 +05:30
sahil28297
9a6517f8f0
fix(BOM): update modified field
2019-06-23 20:06:18 +05:30
Himanshu Warekar
d70c656142
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-21 22:57:34 +05:30
Himanshu Warekar
d1ca820e1e
fix: add function for timedelta conversion
2019-06-21 22:57:06 +05:30
NahuelOperto
4448e2d66b
fix order in general ledger
2019-06-21 08:50:37 -03:00
Sahil Khan
aef77058b6
fix(BOM): set default value of include_exploded_item to 0
2019-06-21 11:37:45 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO
...
fix: copy_payment_schedule_from_quot_to_SO
2019-06-21 09:19:20 +05:30
Aditya Hase
2f4f9a2af0
Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop
2019-06-21 06:11:13 +05:30
Mangesh-Khairnar
bd999b0908
fix: minor changes
2019-06-21 00:49:48 +05:30
Himanshu
c26ce5c506
Merge branch 'develop' into sla_fix
2019-06-20 23:58:08 +05:30
Himanshu Warekar
f5262c54ff
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-20 23:30:20 +05:30
Himanshu Warekar
9f19a82ec9
fix: scheduling bug if out of bussiness hours
2019-06-20 23:29:56 +05:30
Aditya Hase
9986155e8e
chore: Python 3 Tests on Travis ( #18012 )
...
chore: Python 3 Tests on Travis
2019-06-20 22:53:23 +05:30
rohitwaghchaure
8b7267eb60
Merge pull request #17921 from Mangesh-Khairnar/expense-claim
...
feat: Tax based expense claim
2019-06-20 22:02:52 +05:30
Aditya Hase
d4aea67517
Merge branch 'develop' into py3-2
2019-06-20 21:22:24 +05:30
Aditya Hase
c980143764
fix(test): Explicitly search for Material Request Item with Item Code
2019-06-20 21:15:55 +05:30
Aditya Hase
bb5ca5a01f
fix(py3): Convert filter to list
2019-06-20 20:10:53 +05:30
Deepesh Garg
d11e481888
Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission
...
fix: Get Accounting Dimension only if user has read permission on it
2019-06-20 19:44:59 +05:30
rohitwaghchaure
d2061b44dd
fix: could not find company all ( #17978 )
2019-06-20 19:13:54 +05:30
Deepesh Garg
23deb6f79b
fix: Default cost center fix for delivery note item ( #17990 )
2019-06-20 19:11:58 +05:30
Suraj Shetty
01f56b867e
fix: Return empty array to avoid failure
2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68
fix: Use can_read API
2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb
Merge pull request #17998 from netchampfaris/app-logo-url
...
fix: App logo URL
2019-06-20 17:53:40 +05:30
Deepesh Garg
ffa4ba06ec
Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes
...
fix: GST report fixes
2019-06-20 17:22:59 +05:30
Suraj Shetty
da629810ad
fix: Get accounting dimensions only if user has access
2019-06-20 17:20:19 +05:30
deepeshgarg007
6ef38ebf34
fix: GSTR report fixes
2019-06-20 15:55:09 +05:30
deepeshgarg007
50f4fc48a5
fix: GSTR report fixes
2019-06-20 15:53:14 +05:30
deepeshgarg007
5ff830b6f4
fix: GSTR report fixes
2019-06-20 15:50:02 +05:30
deepeshgarg007
a8e49b8afd
Revert "fix: GSTR-2 Report fixes"
...
This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.
2019-06-20 15:26:04 +05:30
deepeshgarg007
7483cb49fe
Revert "fix: GSTR-1 Report fixes"
...
This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.
2019-06-20 15:25:06 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen
...
fix(stock): Remove hardcoded validation for Item
2019-06-20 14:21:57 +05:30
Mangesh-Khairnar
8619fc7413
fix: fetch rate only if field is empty
2019-06-20 12:02:47 +05:30
Himanshu
014dc1729d
Merge branch 'develop' into sla_fix
2019-06-20 11:36:29 +05:30
Faris Ansari
23f9b6156f
fix(Opportunity): Don't assign to Guest ( #17996 )
...
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
2019-06-20 11:34:14 +05:30
Himanshu Warekar
a1c1f74d84
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-20 11:33:06 +05:30
Himanshu Warekar
a03aa0014e
feat: update sla using custom script
2019-06-20 11:32:49 +05:30
Aditya Hase
903d5201b4
fix(tests): Do not test order of features in Location ( #17983 )
...
fix(tests): Do not test order of features in Location
2019-06-20 11:29:59 +05:30
Himanshu
d82175da36
Merge branch 'develop' into sla_fix
2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef
feat: change apply_to to entity
2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855
feat: filter sla based on customer in issue
2019-06-20 10:00:11 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests
2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846
Merge pull request #17995 from deepeshgarg007/hsn_summary_develop
...
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 21:48:15 +05:30
Faris Ansari
357592f55e
fix: Remove logo replace logic
2019-06-19 19:17:50 +05:30
Faris Ansari
4a1c7ddb09
fix: App logo URL
2019-06-19 19:15:37 +05:30
Aditya Hase
6a40c491df
Merge branch 'develop' into fix-location-tests
2019-06-19 18:50:00 +05:30
deepeshgarg007
ecc670047e
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 18:36:24 +05:30
Suraj Shetty
16baa3b13a
fix: Move back .pylintrc to root
2019-06-19 18:35:36 +05:30
Suraj Shetty
d4420afb72
chore: Remove unwanted files
2019-06-19 18:33:56 +05:30
Deepesh Garg
2b739b304e
Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application
...
fix(employee-benefit-application): remove query from setup
2019-06-19 18:18:47 +05:30
Mangesh-Khairnar
0ef1df72ad
refactor: fetch rate directly from the account head
2019-06-19 17:50:33 +05:30
Himanshu
3caf7b80e5
Merge branch 'develop' into sla_fix
2019-06-19 16:08:35 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate
...
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
Himanshu Warekar
24cef8e26e
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-19 14:43:59 +05:30
Himanshu Warekar
36d6e570c4
patch: try catch to handle TableMissingError
2019-06-19 14:43:21 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email
...
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Himanshu
7bb1402a37
Merge branch 'develop' into sla_fix
2019-06-19 13:42:49 +05:30
Mangesh-Khairnar
439313e524
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465
fix: track status for pending leaves
2019-06-19 13:00:52 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Himanshu Warekar
f4f7e781c5
debug: travis
2019-06-19 12:01:59 +05:30
Aditya Hase
645afe16c3
fix(tests): Do not test order of features in Location
2019-06-18 23:01:20 +05:30
Aditya Hase
be8a46a92a
fix(tests): Timesheet tests
2019-06-18 21:50:05 +05:30
Rohit Waghchaure
5f9793e081
fix: finance book filters includes the gl data which don't have finance book
2019-06-18 21:09:52 +05:30
Himanshu Warekar
2724de9320
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-18 20:02:26 +05:30
Himanshu Warekar
e48ca44bf5
patch: fix typo
2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6
patch: refactor patch for travis test
2019-06-18 19:35:50 +05:30
Aditya Hase
48585c94ff
fix: Consider discount_amount only when provided to calculate rate
...
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.
All DocTypes on buying side have this bug.
2019-06-18 19:11:17 +05:30
Himanshu Warekar
befd393dcb
fix: patch
2019-06-18 12:51:12 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Suraj Shetty
5b52aba8df
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-18 11:28:20 +05:30
Suraj Shetty
a28b96493f
fix: Make field labels translatable
2019-06-18 11:28:14 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog
2019-06-18 11:09:29 +05:30
Suraj Shetty
9ba9a91631
fix: Strip leading zero from phone number
2019-06-18 10:56:47 +05:30
Deepesh Garg
c38e0bb75c
Merge pull request #17959 from deepeshgarg007/dimension-fixes
...
fix: Is group filter fixes in dimensions
2019-06-18 08:37:32 +05:30
Himanshu Warekar
7c18f69727
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 23:53:01 +05:30
Himanshu Warekar
0ad3887d51
patch: fixes
2019-06-17 23:52:53 +05:30
deepeshgarg007
946eefe039
fix: Codacy fixes
2019-06-17 23:10:36 +05:30
Mangesh-Khairnar
7293a98a10
fix: change formatting
2019-06-17 19:03:46 +05:30
Mangesh-Khairnar
9ee5c8a4c6
fix(employee-benefit-application): remove query from setup
2019-06-17 18:07:10 +05:30
Himanshu Warekar
bdf9737d73
patch: reload service level priority
2019-06-17 18:00:57 +05:30
Anurag Mishra
3d47a6dbb5
fix: Company filters in Total Stock Summary Report ( #17965 )
2019-06-17 17:49:04 +05:30
rohitwaghchaure
cfcf7ae7b6
Merge pull request #17960 from rohitwaghchaure/delayed_order_reports
...
feat: delayed order reports
2019-06-17 17:42:18 +05:30
Rohit Waghchaure
4803e817e9
fix: bank guarantee, not able to select the purchase order
2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351
fix(minor): format date in user format for accounting dashboard
2019-06-17 17:33:24 +05:30
rohitwaghchaure
fdb79063a0
Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop
...
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 17:24:29 +05:30
Rohit Waghchaure
7efeffa66a
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 16:20:32 +05:30
Rohan Bansal
4babfdb987
fix(delivery): Add more context for dispatch notification email + formatting fixes
2019-06-17 16:16:51 +05:30
Mangesh-Khairnar
57f4e817f8
Merge branch 'develop' into company_ui/ux_fix
2019-06-17 15:36:45 +05:30
deepeshgarg007
dfe006be19
Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes
2019-06-17 15:26:05 +05:30
Suraj Shetty
04d623ab66
fix: Get employee login ids directly from child table
2019-06-17 15:20:28 +05:30
Suraj Shetty
db26191937
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-17 14:17:26 +05:30
Suraj Shetty
8b95b61aa0
fix: Remove unwanted code
2019-06-17 14:17:21 +05:30
Rohit Waghchaure
b5f94e5f71
fix: not able to save asset if depreciation method is manual
2019-06-17 13:34:44 +05:30
Faris Ansari
2e968ece1a
Delete test_call_log.py
2019-06-17 13:03:44 +05:30
Faris Ansari
520c403a05
Delete call_log.js
2019-06-17 13:02:49 +05:30
Suraj Shetty
ec6afbbe99
Merge pull request #17953 from netchampfaris/website-theme-import
...
fix: Add erpnext website theme import
2019-06-17 12:56:24 +05:30
Rohit Waghchaure
725f56faca
feat: delayed order reports
2019-06-17 12:50:44 +05:30
deepeshgarg007
d1e0f42fea
fix: Styling fix
2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33
fix: Is group filter fixes in dimensions
2019-06-17 12:44:49 +05:30
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
...
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification
...
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30
Rohan Bansal
0426636a32
fix(customer): Improve performance by reducing queries
2019-06-17 12:16:12 +05:30
Himanshu Warekar
67f9b63793
patch: get priority before reload_doc
2019-06-17 11:49:02 +05:30
Suraj Shetty
340ccb6c96
fix: Remove unwanted code
2019-06-17 10:16:38 +05:30
Himanshu Warekar
199b43dbbb
fix: patch fixes for sla
2019-06-17 09:35:34 +05:30
Suraj Shetty
a86a07ef37
fix: Add additional check to ensure doc_before save exists
2019-06-17 09:29:46 +05:30
Suraj Shetty
eb0ca67ced
fix: Caller name in call popup
2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a
fix: Decouple call popup from exotel
2019-06-17 08:46:38 +05:30
Himanshu Warekar
c58d0317a4
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 08:43:36 +05:30
Suraj Shetty
3fdeffff7a
feat: Add medium field in call log doctype
2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596
feat: Add call recording URL field to call log
2019-06-17 08:06:14 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
Deepesh Garg
7793df885b
Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes
...
fix: GSTR-3b Report fixes
2019-06-16 20:03:48 +05:30
Himanshu Warekar
b9ddcc4bfa
Merge develop into sla_fix
2019-06-15 13:09:57 +05:30
Faris Ansari
8e99aaf605
fix: Add erpnext website theme import
2019-06-14 20:06:54 +05:30
Faris Ansari
b2ab1031e3
fix: Show Clear filters when attribute filters are set
2019-06-14 18:16:14 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling ( #17912 )
2019-06-14 18:15:40 +05:30
rohitwaghchaure
7ae0f25f11
Merge pull request #17952 from rohitwaghchaure/added_promotional_scheme_in_selling_buying
...
fix: added promotional scheme in selling and buying module page
2019-06-14 17:31:43 +05:30
Rohit Waghchaure
1ecc78266c
fix: added promotional scheme in selling and buying module page
2019-06-14 17:31:15 +05:30
Rohit Waghchaure
059890ecef
Test cases for batch no
2019-06-14 17:24:47 +05:30
Faris Ansari
f472a49cf6
fix: Remove Specifications label
2019-06-14 16:32:21 +05:30
Mangesh-Khairnar
1db0fc91a5
fix: check generated ledger entries to avoid overlap
2019-06-14 15:48:31 +05:30
Mangesh-Khairnar
fefdac432c
refactor: add json changes
2019-06-14 15:39:50 +05:30
Mangesh-Khairnar
24fbe23c8d
fix: add indicators for expire in the leave allocation list
2019-06-14 15:36:26 +05:30
Anurag Mishra
a5527225b6
fix: requested changes
2019-06-14 15:26:19 +05:30
Mangesh-Khairnar
87adaed933
fix: generate ledger entries for all leave transactions
2019-06-14 15:13:53 +05:30
deepeshgarg007
37a717aa98
fix: Seperate queries for Taxable value and tax amounts
2019-06-14 14:30:36 +05:30
Anurag Mishra
e87ebcaf04
fix: upadated employee dashboard
2019-06-14 14:10:48 +05:30
Anurag Mishra
0ae6cbdd01
fix: requested Changes
2019-06-14 14:10:48 +05:30
Anurag Mishra
e6dd55d9f2
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
rohitwaghchaure
6f6a1c8908
Merge pull request #17946 from Anurag810/make_stock_entry_against_purchase_receipt_3
...
feat: Creating stock entry against purchase receipt and some minor fixes
2019-06-14 13:32:22 +05:30
deepeshgarg007
c62518c094
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes
2019-06-14 13:14:51 +05:30
deepeshgarg007
8f04f6c631
fix: GSTR-3b Report fixes
2019-06-14 13:08:09 +05:30
Anurag Mishra
4c1639305f
feat: creating stock entry against purchase receipt
2019-06-14 12:31:08 +05:30
Deepesh Garg
b095d0a0c5
fix: GSTR-2 Report fixes ( #17903 )
2019-06-14 12:02:36 +05:30
Deepesh Garg
459155fae1
fix: GST Validation for UIN and OIDAR ( #17866 )
...
* fix: GST Validation for UIN and OIDAR
* fix: Define GST category
* fix: Get gst category only for Customer and Supplier
* fix: GST validation
* fix: GST validation fixes
2019-06-14 12:01:34 +05:30
Rushabh Mehta
35bb7b8761
Merge pull request #17369 from alyf-de/datev_report
...
feat(regional): Report for German tax consultants (DATEV)
2019-06-14 12:00:04 +05:30
rohitwaghchaure
a030138df8
fix: trial balance opening balance not showing in the debit side for the liability account ( #17944 )
2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b
fix: column width ( #17935 )
2019-06-14 11:29:18 +05:30
Anurag Mishra
88cd502841
fix: company form ( #17939 )
2019-06-14 11:26:29 +05:30
Saurabh
0d50523723
Merge pull request #17941 from nabinhait/salary-slip-amount-dev
...
fix: salary slip amount calculation based on formula
2019-06-14 11:19:31 +05:30
Mangesh-Khairnar
6726dea88b
style: change formatting
2019-06-14 11:17:17 +05:30
Mangesh-Khairnar
4e1b60d401
style: change formatting
2019-06-14 11:15:54 +05:30
Rushabh Mehta
b74454e501
Merge pull request #17894 from deepeshgarg007/serial_no_batch_selector_develop
...
fix: Available qty not shown in item batch selector for batch
2019-06-14 10:51:34 +05:30
Nabin Hait
a2caf884fe
fix: salary slip amount calculation based on formula
2019-06-13 19:44:21 +05:30
Mangesh-Khairnar
f8bf57c956
fix: remove transaction section head
2019-06-13 18:09:23 +05:30
Shivam Mishra
1b5a54900c
Merge pull request #17933 from Anurag810/billing_summary_fixes
...
fix: column sequence and add total hours
2019-06-13 17:26:56 +05:30
Suraj Shetty
7877ef22ba
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-13 17:13:59 +05:30
Suraj Shetty
06f8034542
refactor: Remove redundant code
2019-06-13 17:13:54 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
...
feat: added cost center in the opening invoice creation tool
2019-06-13 16:27:18 +05:30
rohitwaghchaure
95c88a5e95
Merge pull request #17932 from rohitwaghchaure/fixed_pos_not_overriding_the_taxes_develop
...
fix: taxes are not overriding after changing the tax template for the POS invoice
2019-06-13 16:26:11 +05:30
Shivam Mishra
4def9836e0
Merge branch 'develop' into bom-item-fix
2019-06-13 16:17:54 +05:30
Anurag Mishra
05c17a505c
fix: column sequence and add total
2019-06-13 16:08:01 +05:30
Rohit Waghchaure
033ed93586
fix: taxes are not overriding after changing the taxes template
2019-06-13 15:47:42 +05:30
Rohan Bansal
e3a3306b30
feat(customer): Add report to show item prices per Customer
2019-06-13 14:53:33 +05:30
Mangesh-Khairnar
b2f266ad10
fix: get bom item when company is not passed
2019-06-13 14:34:40 +05:30
Faris Ansari
00578ba632
fix: Show product page even if cart is not enabled
2019-06-13 13:30:39 +05:30
Rohit Waghchaure
02ae934d5c
feat: added cost center in the opening invoice creation tool
2019-06-13 12:00:30 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report
...
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
Mangesh-Khairnar
0a3ed374cd
test: validate tax based expense claim gl entries
2019-06-12 20:03:22 +05:30
Anurag Mishra
bbe2c4fb01
fix: fetch item on the base of item group
2019-06-12 19:09:51 +05:30
Mangesh-Khairnar
a1d354e147
feat: add grand total field
2019-06-12 18:18:38 +05:30
Rohan Bansal
ddea50fa22
fix(stock): Remove hardcoded validation for Item
2019-06-12 17:59:23 +05:30
Deepesh Garg
a3c0d2768e
Merge branch 'develop' into serial_no_batch_selector_develop
2019-06-12 17:21:23 +05:30
Shivam Mishra
d9aabb83cd
Merge branch 'develop' into lms-link-fix
2019-06-12 17:21:05 +05:30
Shivam Mishra
b94b1febee
refactor: topic card redirects to login
2019-06-12 17:20:33 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards
...
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
Suraj Shetty
16fc5189d1
Merge branch 'develop' into call-summary-dialog
2019-06-12 17:13:13 +05:30
sahil28297
deef0908d7
Merge branch 'develop' into education-test-fixes
2019-06-12 16:59:58 +05:30
Shivam Mishra
147d5d9bf2
fix: redirect to lms home if query params not set
2019-06-12 16:01:02 +05:30
Deepesh Garg
9c3d2eeb1f
Merge branch 'develop' into serial_no_batch_selector_develop
2019-06-12 15:54:44 +05:30
Shivam Mishra
3264822c1c
test: fixed unknown column course_name
2019-06-12 15:43:36 +05:30
Suraj Shetty
12cd4bcd71
Merge branch 'develop' into call-summary-dialog
2019-06-12 15:43:19 +05:30
Shivam Mishra
44f98a9a4b
fix: back to course button
2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83
fix: card imqge not visible for courses
2019-06-12 15:16:26 +05:30
Shivam Mishra
278ef4bf73
fix: template fix for null_card
2019-06-12 14:53:00 +05:30
Shivam Mishra
a99d3a844f
test: fix fixtures for program and course
2019-06-12 14:32:27 +05:30
Suraj Shetty
a7ac218584
Merge branch 'develop' into call-summary-dialog
2019-06-12 13:28:41 +05:30
Mangesh-Khairnar
444313bdfc
feat: change the claim amount in expenses to amount
2019-06-12 12:52:02 +05:30
Shivam Mishra
28b2da7850
Merge branch 'develop' into lms-patch-4
2019-06-12 12:51:53 +05:30
Shivam Mishra
8df7e1c215
fix: templates for cards
2019-06-12 12:50:38 +05:30
Shivam Mishra
147cd1035e
Merge branch 'develop' into lms-patch-3
2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69
refactor: remove course name field from ProgramCourse
2019-06-12 12:43:22 +05:30
Shivam Mishra
490d2e0357
Merge branch 'develop' into lms-acad-fixes
2019-06-12 12:40:30 +05:30
Shivam Mishra
a9508862b2
refactor: doctype settings for lms
2019-06-12 12:39:12 +05:30
Saurabh
ccbf646a4d
Merge pull request #17904 from deepeshgarg007/patch_fix
...
fix(patch): Fix breaking patch on develop branch
2019-06-12 12:33:38 +05:30
Kenneth Sequeira
add002bb0f
fix: Make Travel Request Document Submittable ( #17874 )
...
* make travel request submittable
* add patch
* remove patch
2019-06-12 12:25:48 +05:30
Suraj Shetty
2f84779667
fix: Last Communication for lead
...
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
deepeshgarg007
44ac3580d9
fix: Fix breaking patch on develop branch
2019-06-11 18:35:01 +05:30
Mangesh-Khairnar
283d2c5ca2
fix: only create leave application ledger on intermediate allocation expiry
2019-06-11 16:35:29 +05:30
Mangesh-Khairnar
ac9a4fe03c
feat: add tax and charges in expense claim
2019-06-11 14:25:44 +05:30
Suraj Shetty
7ff124db95
fix: Show lead name when the lead calls
2019-06-11 14:21:48 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 14:17:54 +05:30
Suraj Shetty
28f7c3ca3f
fix: Add Make contact button
2019-06-11 12:21:30 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
...
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b
fix: requested changes
2019-06-11 11:12:28 +05:30
Suraj Shetty
6013375fbb
fix: Improve call popup UX
...
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928
fix: Save summary to right field
2019-06-11 08:01:18 +05:30
Rohit Waghchaure
ef5dd87928
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
...
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:15:43 +05:30
deepeshgarg007
9297829804
fix: Codacy
2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87
fix: Available qty not shown in item batch selector for batch
2019-06-10 17:46:16 +05:30
Deepesh Garg
ebeafa55ca
fix: Total Amount fix in journal entry ( #17880 )
2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9
fix(patch): escape illegal characters to avoid SQL syntax error ( #17890 )
2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48
fix: GSTR-1 Report fixes ( #17885 )
2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop
...
fix: set COGS for material issue only
2019-06-10 16:57:23 +05:30
Himanshu Warekar
874326dc7b
patch: set apply_to as customer
2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718
Merge develop into sla_fix
2019-06-10 12:32:45 +05:30
Himanshu Warekar
0b36d324ee
fix: display depends for apply_to in sla
2019-06-10 11:36:51 +05:30
Himanshu Warekar
65e0ae2171
test: new test cases for sla
2019-06-10 11:24:24 +05:30
Shivam Mishra
9510e69910
fix (lms): null cards visible on xs
2019-06-10 10:53:25 +05:30
Suraj Shetty
13770ccf7a
fix: Codacy
2019-06-10 09:52:53 +05:30
Suraj Shetty
54bb3e4b9f
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-06-10 09:25:39 +05:30
Himanshu Warekar
88becdd869
test: test cases for sla with apply_to
2019-06-09 19:33:55 +05:30
Himanshu Warekar
0674d16fee
feat: sla based on customer/group/territory
2019-06-07 15:28:42 +05:30
Rohit Waghchaure
9a792c2eed
stock_entry: set COGS for material issue only
2019-06-07 15:20:36 +05:30
Shivam Mishra
449f261128
feat: show signup dialog for Guest
2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee
fix: link typo
2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc
fix: lms card hero image no visible
2019-06-07 13:34:41 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop
...
fix: Not able to save salary slip
2019-06-07 12:58:25 +05:30
Suraj Shetty
f1ffdb3c12
feat: Add call sound effects
2019-06-07 12:48:13 +05:30
Suraj Shetty
6a87e3338b
fix: Call popup UI
2019-06-07 11:52:39 +05:30
Rohit Waghchaure
72264697be
fix: Not able to save salary slip
2019-06-07 11:46:27 +05:30
Mangesh-Khairnar
b16d395a8f
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-07 11:33:06 +05:30
Mangesh-Khairnar
e4d03bf0d0
fix: consider expiry in leaves
2019-06-07 11:30:27 +05:30
rohitwaghchaure
74f502cfa6
Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items
...
feat: provision to set multiple manufacturer against the item
2019-06-07 10:24:53 +05:30
Suraj Shetty
c8c17422f7
fix: Change call log fieldname and some cleanups
2019-06-07 10:22:50 +05:30
Mangesh-Khairnar
368a974368
style: change formatting
2019-06-06 20:43:32 +05:30
Mangesh-Khairnar
86e0f4c617
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-06 20:41:28 +05:30
Mangesh-Khairnar
c7b9ae9c5e
fix: get leave balance based on the ledger entries
2019-06-06 20:38:59 +05:30
Mangesh-Khairnar
b840ba4407
feat: show dashboard on submit
2019-06-06 20:38:23 +05:30
Mangesh-Khairnar
00c607116b
fix: handle negative leaves without allocation
2019-06-06 20:37:34 +05:30
Mangesh-Khairnar
f13243a92e
feat: fetch annual allocation based on leave policy
2019-06-06 20:35:10 +05:30
Mangesh-Khairnar
3863fc5fb2
feat: create ledger entry for each earned leave
2019-06-06 20:34:10 +05:30
Mangesh-Khairnar
050f65beb4
feat: fetch leave allocation from ledger entry
2019-06-06 20:32:01 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Himanshu
c4366c9357
Merge branch 'develop' into qmsystem
2019-06-06 19:04:48 +05:30
Anurag Mishra
fd19678bc7
fix: show cost center in print fromat of report trial balance
2019-06-06 18:37:10 +05:30
Anurag Mishra
4ca393d14c
fix: renamed report BOM item scraps into BOM Explorer ( #17869 )
2019-06-06 18:05:08 +05:30
Anurag Mishra
4992fc98dd
Merge branch 'develop' into qmsystem
2019-06-06 17:25:39 +05:30
Shivam Mishra
d49b5e4736
fix: sql query case fix
2019-06-06 17:19:53 +05:30
Himanshu
b57b4a7199
Merge branch 'develop' into qmsystem
2019-06-06 16:42:53 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor
...
refactor: lms
2019-06-06 16:32:17 +05:30
Shivam Mishra
2a0483dee3
refactor: styling cards and article
2019-06-06 16:02:38 +05:30
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem
2019-06-06 15:37:04 +05:30
Suraj Shetty
97780613ad
fix: Improve call popup UI
2019-06-06 14:48:37 +05:30
Suraj Shetty
c0a640c462
feat: Add user_id of employee to employee group
2019-06-06 14:47:40 +05:30
Shivam Mishra
6132c8527b
refactor: all programs are shown on home by deafult
2019-06-06 14:19:36 +05:30
Himanshu Warekar
db1d1197ea
feat: add fixtures
2019-06-06 14:17:07 +05:30
Shivam Mishra
098b8324f2
refactor: remove erpnext.com link
2019-06-06 14:14:17 +05:30
Himanshu Warekar
ab97cd4db1
feat: dashboards
2019-06-06 14:13:10 +05:30
Shivam Mishra
b31276572b
refactor: styling changes
2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b
fix: minor bugs
2019-06-06 14:02:49 +05:30
Himanshu Warekar
b114d9f621
test: fix test case
2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267
[Add] GSTIN filters in hsn wise summary and itemised reports
2019-06-06 12:08:09 +05:30
Himanshu Warekar
b318b83bb7
patch: fixes
2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124
patch: fixes
2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6
patch: add priority in service level and agreement
2019-06-06 11:49:15 +05:30
Shivam Mishra
624b4fd5b8
refactor: better sql
2019-06-06 11:30:56 +05:30
Suraj Shetty
87645e98ad
fix: Get available employees from communication medium
2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549
fix: Create call log instead of communication
2019-06-06 11:18:16 +05:30
Himanshu Warekar
b9c24a01da
patch: reload_doc before inserting values
2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249
patch: set priorities for issue
2019-06-06 10:58:42 +05:30
Suraj Shetty
27234ff907
fix: Update call log doctype
2019-06-06 10:57:13 +05:30
Himanshu Warekar
e119a713fd
Merge develop into sla_fix
2019-06-06 10:46:36 +05:30
Saurabh
6179130a54
Merge pull request #17861 from frappe/clarkejj-patch-1
...
fix: Update demo.html
2019-06-06 10:37:48 +05:30
Aditya Hase
29e77ccc00
fix(error-report): Do not send error reports to support@erpnext.com
2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d
Update demo.html
...
fix typo nit in page
2019-06-05 10:49:47 -06:00
Mangesh-Khairnar
351f4d53a0
feat: add employee filter to employee leave balance
2019-06-05 21:22:07 +05:30
Mangesh-Khairnar
62011c9dc4
feat: add link to policy
2019-06-05 21:16:27 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print ( #17860 )
2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05
fix(attendance): fetch employee name ( #17857 )
2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46
fix: NoneType fixes in Lab test ( #17858 )
2019-06-05 20:23:23 +05:30
Shivam Mishra
f121b51951
fix: import _ in porgram.py
2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa
feat: added topic page
2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe
chore: remove old lms files
2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0
fix: minor ui fixes
2019-06-05 18:16:09 +05:30
Shivam Mishra
9cad9439a1
fix: travis fixes for education setup
2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95
refactor: minor fixes
2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27
chore: added session check for profile page
2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede
feat: added student profile page
2019-06-05 17:29:48 +05:30
Rohan
bd9abc15b5
fix(projects): Remove hardcode of expected end date for new Tasks ( #17717 )
2019-06-05 14:17:29 +05:30
Himanshu Warekar
b903da6bfd
fix: remove priorities list
2019-06-05 13:42:03 +05:30
Shivam Mishra
6593263df8
feat: added navigation
2019-06-05 13:34:44 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component ( #17852 )
2019-06-05 13:20:08 +05:30
Shivam Mishra
570161b978
feat: added course progress apis
2019-06-05 13:08:53 +05:30
Suraj Shetty
0d64343ec0
feat: Add Call Log, Communication Medium, Communication Medium Timeslot doctype
2019-06-05 12:25:17 +05:30
Suraj Shetty
bf1195e0b9
feat: Introduce communication module
2019-06-05 12:23:30 +05:30
Aditya Hase
811bed32c1
fix(naming): Limit number of docs to be renamed to 50000 per doctype ( #17827 )
...
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error
This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Himanshu
4cb1a1e2e3
fix: set task weight from onboarding template ( #17840 )
2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
da2e009990
fix(payment-order): filter already created payment entries ( #17843 )
2019-06-05 10:22:05 +05:30
Suraj Shetty
cf270845f2
fix: Indicator toggler
2019-06-05 10:04:51 +05:30
deepeshgarg007
a87c545907
fix: Remove support analytics report
2019-06-05 09:07:42 +05:30
deepeshgarg007
1831844fcf
fix: Dashboard for cost center
2019-06-03 21:53:58 +05:30
Mangesh-Khairnar
afa1dc4ffa
feat: expire current allocation
2019-06-03 20:09:22 +05:30
Himanshu Warekar
68ed272bfa
feat: show priorities listed in sla in issue
2019-06-03 18:59:55 +05:30
Rohit Waghchaure
8309582cca
fix: report Payment Period Based On Invoice Date not working
2019-06-03 18:23:54 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
...
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Shivam Mishra
6d4c666476
feat: added topic progress api
2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae
feat: added auto course enrollment for enrolled programs
2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop
...
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
...
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934
fix: Pass delivery document no as empty string
2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b
refactor: refactored quiz api and added quiz.js
2019-06-03 12:57:38 +05:30
Suraj Shetty
d1668e22d1
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-06-03 12:36:45 +05:30
Suraj Shetty
e9bfecf405
fix: Add code to update call summary
2019-06-03 12:27:02 +05:30
deepeshgarg007
853a561f11
fix: Serial no filtering issue for delivered items
2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413
fix: codacy
2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c
fix: codacy
2019-06-02 19:46:44 +05:30
deepeshgarg007
290847df46
fix: Fixes in accounting doctype dashboards
2019-06-02 19:35:18 +05:30
Rohit Waghchaure
87c4b06437
Test cases for serial no
2019-06-02 16:29:07 +05:30
Rohit Waghchaure
66aa37f1e2
provision to add batch number in the stock reconciliation
2019-06-02 16:29:07 +05:30
Rohit Waghchaure
05d3bcb63d
stock recon for serial no, batch no
2019-06-02 16:29:06 +05:30
deepeshgarg007
6d313c72e1
fix: Remove diemnsion from value list if present
2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a
fix: Resolve merge conflicts in purchase_receipt_item
2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785
fix: Update function name
2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-06-01 22:57:51 +05:30
Faris Ansari
b8eaa3d377
fix: Issue list portal styling
2019-06-01 20:56:37 +05:30
Saurabh
011fe48ec3
Merge pull request #17823 from abhijitkumbharInd/develop
...
fix: Vehicle Master - Last carbon check accepting future date.(#17821 )
2019-05-31 14:26:08 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
...
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
b6028b0495
Merge pull request #17809 from Alchez/develop-sales-analytics-total
...
fix(selling): Remove Totals row for Sales Analytics
2019-05-31 14:21:01 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev
...
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
abhijitkumbharIND
39d6cf38fc
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f
fix: Vehicle Master - Last carbon check accepting future date.( #17821 )
2019-05-31 14:19:04 +05:30
Rohit Waghchaure
e98d1c1147
fix: allow import for packing slip
2019-05-31 14:16:11 +05:30
Suraj Shetty
893a0c24bb
fix: Add call summary
2019-05-31 13:42:22 +05:30
Deepesh Garg
bd3c60254a
Merge pull request #17819 from deepeshgarg007/module
...
fix: Add chart of accounts importer in data import module
2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
...
fix: POS cash mode of payment css
2019-05-31 12:29:19 +05:30
Rohit Waghchaure
840244c562
fix: pricing rule is applying on the incorrect item
2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c
fix: Add chart of accounts importer in data import module
2019-05-31 10:11:46 +05:30
Mangesh-Khairnar
c5385e141b
fix: add mandatory reason fields in leave application
2019-05-31 00:53:28 +05:30
Rohit Waghchaure
4fd704dbb6
fix: POS cash mode of payment css
2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b
fix: Label translations
2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70
fix: Add translations for missing labels in AR report
2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d
fix: pricing rule not exists issue
2019-05-30 22:24:24 +05:30
Mangesh-Khairnar
95e5d812fe
fix: UX changes
2019-05-30 22:22:15 +05:30
deepeshgarg007
2580075583
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-30 22:11:27 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
Shivam Mishra
46b3446da0
refactor: add check for max passing score
2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5
refactor: added question type field
2019-05-30 18:54:58 +05:30
Shivam Mishra
253a2bd260
refactor: goodbye Vue 👋
2019-05-30 18:54:11 +05:30
Shivam Mishra
e94e9d2b06
feat: content navigation and activity tracking working
2019-05-30 18:23:03 +05:30
Nabin Hait
0e1e37c921
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-30 18:13:41 +05:30
Shivam Mishra
3336fb595c
style: removed console.logs
2019-05-30 18:04:36 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Nabin Hait
b6ffaf11fe
Merge pull request #17787 from nabinhait/naming-series-chars
...
fix: Allowed '{' and '}' in naming series
2019-05-30 17:25:08 +05:30
Nabin Hait
1bb3fc3c19
Merge pull request #17789 from sunnyakaxd/patch-2
...
fix: Dont fetch all orders to update a few
2019-05-30 17:24:49 +05:30
Shivam Mishra
12579617f3
refactor: added enrolled status to program card
2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc
feat: enabled per student access
2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000
refactor: style changes and template refactor
2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1
refactor: added enrollment api
2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b
refactor: added program card macro
2019-05-30 16:34:53 +05:30
Nabin Hait
d060890817
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 16:05:30 +05:30
Deepesh Garg
af32ed6d8f
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
...
feat: Product Bundle Balance Report
2019-05-30 15:58:25 +05:30
Saurabh
2b40a44429
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
...
feat: Updated translation
2019-05-30 15:56:45 +05:30
Nabin Hait
4d58734492
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 15:51:29 +05:30
Saif Ur Rehman
7129231dbb
fix(Product Bundle Balance): Update frappe.db.escape for v12
2019-05-30 13:55:32 +05:00
Anurag Mishra
62d58acea9
fix: Added description if item variants does not have description in map(v12) ( #17796 )
...
* fix: variant item description based on attribute
* style: removed unwanted changes
2019-05-30 14:04:08 +05:30
frappe
5aeb62f288
feat: Updated translation
2019-05-30 08:17:59 +00:00
Mangesh-Khairnar
91e62f575e
fix: department filters in employee leave balance
2019-05-30 13:38:35 +05:30
Mangesh-Khairnar
2124d9884b
fix: pass positional arguments on creation of leave application
2019-05-30 13:21:34 +05:30
Mangesh-Khairnar
aafb5cb6f6
fix: ignore expired non-carry forwarded allocation on calculating leaves taken
2019-05-30 13:13:14 +05:30
deepeshgarg007
a9b2e4e4a8
fix: White space in subscription plan dashboard
2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754
fix: Tax category dashboard
2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596
fix: Dashboards for doctypes in accounting modules
2019-05-30 11:53:12 +05:30
Himanshu Warekar
70a2734aab
fix: config file for qms
2019-05-30 01:40:31 +05:30
Mangesh-Khairnar
ded33a7e2e
fix: ledger entries creation
2019-05-29 19:12:19 +05:30
Shivam Mishra
f927502cc5
refactor: added lms utilities for enrollment and program list
2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e
refactor: cards and hero markup
2019-05-29 18:38:58 +05:30
Shivam Mishra
08425d46fa
refactor: set Student as default portal role for Education
2019-05-29 18:37:52 +05:30
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance
2019-05-29 18:23:21 +05:30
Mangesh-Khairnar
7cc6a67c18
add department filter to employee leave balance
2019-05-29 15:59:20 +05:30
Mangesh-Khairnar
8f47bffa0e
fix: create an instance
2019-05-29 15:54:14 +05:30
Shivam Mishra
63d8cabb3d
fix: program card height bug
2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7
refactor: /lms redirects to home if lms is disbaled
2019-05-29 15:15:59 +05:30
Shivam Mishra
65681bf317
refactor: allow disbaling self enroll on lms
2019-05-29 15:15:30 +05:30
Himanshu Mishra
70029b818b
Update status_updater.py
2019-05-29 14:19:35 +05:30
Nabin Hait
f1cde0ccf6
fix: Allowed '{' and '}' in naming series
2019-05-29 13:44:03 +05:30
Shivam Mishra
16f3b713bc
Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor
2019-05-29 13:14:50 +05:30
Shivam Mishra
ae2871f962
feat: content not visible to guest users
2019-05-29 13:11:34 +05:30
Himanshu Warekar
38ed090bf8
test: fix test case
2019-05-29 00:16:04 +05:30
Himanshu Warekar
775e9e423a
refactor: QMS refactor initial bringup
2019-05-29 00:05:58 +05:30
Himanshu Warekar
8240f48a8e
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-28 23:40:57 +05:30
Himanshu Warekar
beba79c420
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-05-28 23:40:43 +05:30
Himanshu Warekar
da91cfe1e2
fix: set default priority on sla change
2019-05-28 23:38:43 +05:30
deepeshgarg007
c97c7c51a9
fix: Test cases for accounting dimension
2019-05-28 18:51:10 +05:30
Faris Ansari
da2c742cea
Merge branch 'develop' into request_to_quatation_fix
2019-05-28 18:28:13 +05:30
Faris Ansari
dd016479af
fix: Remove print statement
2019-05-28 18:27:22 +05:30
Anurag Mishra
5afe9f2200
fix: changed dialog field to select
2019-05-28 18:23:34 +05:30
deepeshgarg007
233b88dc52
fix: Test case fixes
2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
Nabin Hait
e7b8400fc7
Merge pull request #17696 from Anurag810/warehouse_type
...
feat: Added Warehouse Type master
2019-05-28 17:25:13 +05:30
deepeshgarg007
e025aabef0
fix: Indentation fixes
2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
Mangesh-Khairnar
ae4228aed4
fix: fetch queries
2019-05-28 13:24:15 +05:30
deepeshgarg007
adccb2c3a4
fix: Remove print statements
2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b
fix: Is group filter for dimensions for doctype
2019-05-28 12:13:53 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Himanshu
6f08866640
Merge branch 'develop' into sla_fix
2019-05-28 11:54:30 +05:30
Himanshu Warekar
fee2fee83a
fix: test cases
2019-05-28 11:47:51 +05:30
Mangesh-Khairnar
9d6151d200
patch: add reload doc for leave ledger entry
2019-05-28 11:45:51 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
...
fix: Tax calculation on salary slip
2019-05-28 11:16:31 +05:30
Anurag Mishra
a69f72988a
fix: requested filters changes
2019-05-28 11:08:14 +05:30
Mangesh-Khairnar
c6d6adcbf3
fix: ledger entry creation for encashment
2019-05-28 09:44:38 +05:30
Himanshu Warekar
c7170f80ce
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-28 00:02:54 +05:30
Himanshu Warekar
24f8310ece
fix: test cases
2019-05-28 00:01:55 +05:30
Mangesh-Khairnar
61bb236cfa
test: delete ledger entry after each test to maintain balance
2019-05-27 19:36:40 +05:30
Nabin Hait
351e9983cf
Merge pull request #17389 from mujeerhashmi/develop
...
feat: Student Group with Student Category filter
2019-05-27 19:14:31 +05:30
Nabin Hait
9813897ec3
Merge pull request #17759 from saurabh6790/custom_field_fix
...
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:39 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Nabin Hait
7f375d209c
fix: Tax calculation on salary slip
2019-05-27 18:42:53 +05:30
Anurag Mishra
32c23ae274
fix: added read write permission to stock manager
2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea
fix: added permission and fix filters in stock balance report
2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0
feat: added warehouse type master
2019-05-27 18:37:04 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress
...
fix(UX): Upload Attendance
2019-05-27 17:17:03 +05:30
Nabin Hait
e662be7508
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
...
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
4f549cc196
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 17:16:03 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Mangesh-Khairnar
35786c0067
Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management
2019-05-27 15:42:11 +05:30
Mangesh-Khairnar
6f69bbe1d7
test: leave ledger balance
2019-05-27 15:40:36 +05:30
Mangesh-Khairnar
7fbaef5de3
fix: expiry ledger creation
2019-05-27 15:39:48 +05:30
Suraj Shetty
bd03a51e8f
fix: Handle end call
2019-05-27 15:30:41 +05:30
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-27 14:00:43 +05:30
Nabin Hait
39490ca0c5
Merge branch 'develop' into sla_fix
2019-05-27 13:59:56 +05:30
Nabin Hait
c9a4111f4d
Merge branch 'develop' into leave-management
2019-05-27 13:59:27 +05:30
Mitchy25
a8f6938556
Fix: Precision in Appraisals ( #17673 )
...
* Update appraisal.js
This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.
* fix: score based on field's precisin
2019-05-27 13:57:56 +05:30
Nabin Hait
235332d4ab
Merge branch 'develop' into lms-refactor
2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50
fix: GSTR-1 Report B2B fixes ( #17751 )
...
* fix: GSTR-1 Report fixes
* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c
fix: holidays was showing on same date in calendar view ( #17754 )
2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
71cdcb3593
style: add a more descriptive method name
2019-05-27 11:00:04 +05:30
Mangesh-Khairnar
24248f687b
patch: create entries for only missing transactions
2019-05-27 10:58:42 +05:30
Suraj Shetty
39a4d59cf6
fix: Call popup modal
2019-05-27 10:38:43 +05:30
Mangesh-Khairnar
45197965d7
fix: give cancellation permission to hr manager
2019-05-27 03:26:48 +05:30
Mangesh-Khairnar
d751281fa7
fix: application and leave encashment test cases
2019-05-27 03:23:58 +05:30
Mangesh-Khairnar
e7d307e6bf
fix: only expire carry forwarded allocation via scheduler
2019-05-27 03:21:32 +05:30
Mangesh-Khairnar
2417c93d0e
feat: create expiry and carry forward calculation on leave allocation creation
2019-05-27 03:20:10 +05:30
Mangesh-Khairnar
c99f644ffe
test: carry forward and expiry allocation
2019-05-27 03:13:47 +05:30
Mangesh-Khairnar
7a7f4bd822
fix: leave balance calculation
2019-05-27 03:12:57 +05:30
Mangesh-Khairnar
9e3b688333
test: create leave policy
2019-05-27 03:10:39 +05:30
Mangesh-Khairnar
f3926d0fcb
patch: leave ledger entries
2019-05-26 20:17:16 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
Suraj Shetty
824d0ecc48
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-26 07:30:51 +05:30
Himanshu Warekar
6feb12d333
fix: miscellaneous fixes
2019-05-26 00:03:40 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress
2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61
fix(minor): after manual testing
2019-05-24 11:22:31 +05:30
Suraj Shetty
591ad37894
fix: call popup [wip]
2019-05-24 10:11:48 +05:30
Mangesh-Khairnar
45cf02308e
fix: prevent manual creation of ledger entries
2019-05-23 20:29:18 +05:30
Mangesh-Khairnar
8ef81870bb
test: create leave ledger entry for encashment
2019-05-23 20:28:16 +05:30
Faris Ansari
513bfc26d2
Merge branch 'develop' into upload-attendance-progress
2019-05-23 20:04:16 +05:30
Nabin Hait
d8496a770a
fix: validate expense account for opening stock reco
2019-05-23 15:32:55 +05:30
rohitwaghchaure
0c2e3c77a3
fix: range 4 for ageing filter added in the AP/AR report ( #17715 )
2019-05-23 15:27:47 +05:30
rohitwaghchaure
fd4815da53
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12
...
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-23 15:04:43 +05:30
Faris Ansari
8f784c8555
fix: Remove console statement
2019-05-23 14:39:38 +05:30
Saurabh
ba04c3e5bb
fix: table name alias ( #17706 )
2019-05-23 14:16:56 +05:30
Nabin Hait
5173170be3
fix: validate expense account for opening stock entry
2019-05-23 12:10:51 +05:30
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
Nabin Hait
79f84e58ba
test: Add test case for opening stock entry gle
2019-05-23 11:16:12 +05:30
Nabin Hait
8770ea2631
fix: Opening accounting entry for stock entry
2019-05-23 11:15:04 +05:30
Saurabh
45cd60dfb2
Merge pull request #17645 from nabinhait/bom-item-rate-dev
...
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-22 18:58:34 +05:30
Mangesh-Khairnar
5ba17c87e5
feat: remove update allocation after submit
2019-05-22 18:29:22 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Suraj Shetty
07fe299628
fix: Make changes to fix call flow and popup trigger
2019-05-22 15:48:57 +05:30
Nabin Hait
318ba2b538
Merge branch 'develop' into lms-refactor
2019-05-22 15:15:51 +05:30
Nabin Hait
0ce85735b8
Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12
2019-05-22 15:06:04 +05:30
Nabin Hait
13e0fcde0c
Merge branch 'develop' into upload-attendance-progress
2019-05-22 15:05:50 +05:30
Nabin Hait
5ee08620cb
Merge branch 'develop' into po-status-updater-dev-1
2019-05-22 15:05:08 +05:30
Suraj Shetty
ee7d6e4598
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-22 14:55:48 +05:30
rohitwaghchaure
8529cde0f0
Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop
...
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-22 13:23:44 +05:30
rohitwaghchaure
0432d3844b
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop
...
fix: removed translation for customer type and tax charge type
2019-05-22 13:23:25 +05:30
Rohit Waghchaure
68a1456672
fix: removed translation for customer type and tax charge type
2019-05-22 13:22:39 +05:30
Nabin Hait
ecf25907a5
fix: set schedule date from MR to PO
2019-05-22 13:07:26 +05:30
Nabin Hait
bfb09d51a3
fix: test cases
2019-05-22 12:15:56 +05:30
Nabin Hait
b7bdcc3992
fix: Don't set reqd date in PO based on MR, if less than today
2019-05-22 12:01:17 +05:30
Nabin Hait
915edbf9ce
fix: po status
2019-05-22 12:00:36 +05:30
Nabin Hait
d752051b8d
fix: update received qty in PO from PR
2019-05-22 11:59:19 +05:30
Suraj Shetty
fb1964aa18
fix: Changes to fix popup
2019-05-22 06:38:25 +05:30
Suraj Shetty
1eeb89fb77
feat: Add get_call status & make a call function
2019-05-22 06:37:43 +05:30
Suraj Shetty
57bab84198
feat: Add exotel settings
2019-05-22 06:25:45 +05:30
Himanshu Warekar
ff1a8b3070
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-21 22:42:10 +05:30
Himanshu Warekar
323ea2d33a
feat: change SLA as well as priorities
2019-05-21 22:39:42 +05:30
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress
2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225
fix(UX): Upload Attendance
...
Enqueue import if rows more than 200. Show import progress in dashboard.
2019-05-21 17:58:55 +05:30
Rohit Waghchaure
c41118bac7
Get default warehouse from the stock settings in the get_item_details
2019-05-21 15:21:13 +05:30
Nabin Hait
7327f8a901
fix: Person / Org name is not mandatory while creation of lead from email ( #17676 )
2019-05-21 15:05:26 +05:30
Rushabh Mehta
98a80407f8
Merge pull request #17538 from adityahase/fix-training-feedback
...
fix(hr): Use event_status instead of status
2019-05-21 12:19:03 +05:30
Rushabh Mehta
397a48d11f
Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev
...
fix: GL Entry for opening stock reconciliation
2019-05-21 12:17:22 +05:30
Rohit Waghchaure
5e7b4ca6a4
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-21 12:14:16 +05:30
Shivam Mishra
87a7438d38
chore: added macro for page hero
2019-05-21 12:05:19 +05:30
Shivam Mishra
c8c790a097
feat: Added content page and minor doctype changes
2019-05-21 12:04:50 +05:30
Rushabh Mehta
8c78299158
fix(readme): logo
2019-05-21 11:57:33 +05:30
Rohit Waghchaure
6358370735
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-21 10:53:39 +05:30
Suraj Shetty
863b93c32d
refator: Rename files and move code
2019-05-21 07:57:06 +05:30
Himanshu Warekar
f38486b22c
Merge develop into sla_fix
2019-05-20 23:25:26 +05:30
deepeshgarg007
ff717a7c16
fix: List view button for dimensions
2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
...
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716
feat(Communication): Move Timeline DocType and Name to Dynamic Links ( #17593 )
...
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3
feat: add patch to create custom fields for india specific client
2019-05-20 13:08:18 +05:30
Rohit Waghchaure
97d2a46052
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:28:57 +05:30
Shivam Mishra
d7e8298a5f
feat: added program and course pages
2019-05-20 11:55:32 +05:30
Himanshu Warekar
23a574d794
fix: codacy
2019-05-19 19:34:45 +05:30
Shivam Mishra
823c79588b
feat: Moving to Jinja
2019-05-19 16:01:45 +05:30
Himanshu Warekar
7910215968
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-19 13:48:27 +05:30
Himanshu Warekar
22d8b3037a
tests: fix issue tests
2019-05-19 11:56:37 +05:30
Himanshu Warekar
97b05e8b58
test: fixes
2019-05-19 11:14:59 +05:30
deepeshgarg007
4541605e27
fix: Test Case for accounting dimension
2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e
fix: Rename function in accounting dimension
2019-05-19 11:13:21 +05:30
Himanshu Warekar
f77fe313e3
feat: change sla on the fly
2019-05-19 11:06:00 +05:30
deepeshgarg007
3d11ac0e75
fix: Accounting dimensions for child tables
2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017
fix: Ability to disable dimensions
2019-05-18 23:47:42 +05:30
Suraj Shetty
8a178d6f30
fix: Update call summary dialog
2019-05-18 16:11:29 +05:30
Anurag Mishra
fc86df6453
fix: Allow return if delivery note or sales order is required in selling settings(v12) ( #17631 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:03:08 +05:30
Syed Mujeer Hashmi
045194c230
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-05-17 16:26:31 +05:30
Deepesh Garg
2cab66cda1
Merge pull request #17658 from deepeshgarg007/territory_item_code_develop
...
fix: Inactive Sales Item report fixes
2019-05-17 16:20:30 +05:30
deepeshgarg007
a4c9134d33
fix: Inactive Sales Item report fixes
2019-05-17 16:19:15 +05:30
Deepesh Garg
e796d2844c
fix: Unable to create item variant based on manufacturer ( #17652 )
...
* fix: Unable to create item variant against manufacturer
* fix: Spacing fixes
* fix: Spacing fixes in item.js
2019-05-17 15:39:22 +05:30
Nabin Hait
9764eff1a4
Merge branch 'develop' into gle-opening-stock-reco-dev
2019-05-17 14:34:39 +05:30
Himanshu Warekar
ab596c7236
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-17 11:50:58 +05:30
rohitwaghchaure
c356fef9c4
Merge pull request #17599 from Anurag810/bom_items_and_scraps
...
feat: added report for showing complete hierarchy of bom with item details and scraps
2019-05-17 11:22:12 +05:30
deepeshgarg007
705c03c093
fix: Added dashboard and module links for accounting dimensions
2019-05-17 10:23:00 +05:30
Himanshu Warekar
628ea47c6d
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-17 00:48:23 +05:30
Suraj Shetty
dd6b70c7cd
feat: Show contact on incoming call
2019-05-16 23:55:35 +05:30
Rohan
a094560b8b
fix(tests): Save batch instead of submitting it ( #17637 )
2019-05-16 19:44:55 +05:30
Rushabh Mehta
8ec3718aba
Merge pull request #17625 from rmehta/link-preview-item-task
...
fix: link preview for item and task
2019-05-16 19:35:05 +05:30
Nabin Hait
06c8cf4321
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-16 19:23:00 +05:30
Anurag Mishra
15e2546846
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 18:24:04 +05:30
Nabin Hait
3f119ec256
fix: GL Entry for opening stock reconciliation
2019-05-16 17:29:10 +05:30
Anurag Mishra
dd5d4c49c4
fix: indent
2019-05-16 17:08:44 +05:30
Rohit Waghchaure
cb4e28fb31
fix: changed fieldtype from data to float
2019-05-16 17:01:05 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme ( #17600 )
...
* style: UI fixes for frappe_theme compatibility
* chore: minor ui fixes
2019-05-16 16:38:13 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev
...
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
rohitwaghchaure
144e60a234
Update bom_items_and_scraps.py
2019-05-16 15:03:30 +05:30
Anurag Mishra
39c80789c9
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:59:38 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev
...
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Anurag Mishra
b921d9f94d
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:24:16 +05:30
Nabin Hait
2a8c463079
fix: show tasks in project order by due date and status
2019-05-16 13:46:05 +05:30
Nabin Hait
b90fc7fc0d
fix: Get bank account on selection of payment mode in Loan
2019-05-16 13:45:54 +05:30
Nabin Hait
ab1c43dbee
fix: To allow creation of sales invoice without customer
2019-05-16 13:45:36 +05:30
Suraj Shetty
03c3bd5f4a
feat: Open modal in realtime for incoming call
2019-05-16 13:39:50 +05:30
Anurag Mishra
6f619e2bbf
Merge branch 'develop' into subs
2019-05-16 12:52:26 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Anurag Mishra
b6a4a02dc2
Merge branch 'develop' into subs
2019-05-16 10:48:21 +05:30
Himanshu
0e31089af6
validate: if additional salary exists ( #17529 )
2019-05-16 10:35:02 +05:30
Rushabh Mehta
fd6ae67b16
fix: link preview for item and task
2019-05-16 10:25:27 +05:30
Prasad Ramesh
067d3c0c09
fix: made Sales Partner Comission report visible in Selling module ( #17602 )
2019-05-16 10:18:02 +05:30
Suraj Shetty
d382f1d470
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-16 09:47:17 +05:30
Mangesh-Khairnar
afb0c4aa43
fix: delete entry on cancellation of transaction
2019-05-15 21:50:34 +05:30
Mangesh-Khairnar
f8f02c508d
feat: create leave ledger entry on leave encashment creation
2019-05-15 21:50:06 +05:30
Mangesh-Khairnar
50037f8609
fix: consider min days remaining as remaining leaves
2019-05-15 21:49:27 +05:30
Anurag Mishra
1a98cce3a4
Merge branch 'develop' into subs
2019-05-15 16:40:03 +05:30
Mangesh-Khairnar
6ba9a128e7
feat: calculate leave balance using ledger entries
2019-05-15 15:53:54 +05:30
Mangesh-Khairnar
964deaca96
test: creation of ledger entries on application submit
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
201aeeb20d
test: creation of ledger entries on allocation submit
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
170b8dded8
fix: expiry logic for carry forwarded allocation
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
9bb4b8e8b2
feat: create expiry ledger entry on allocation period completion
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
cf8f4bda8f
fix: skip application fetch for non allocation records
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
783bd89413
feat: handle cancellation workflow for leave application
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5448edff2c
feat: delete cancelled allocation from ledger
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
01490f1560
feat: add cancellation workflow for leave allocation ledger entry
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5ad83c06c2
feat: add ledger entries on leave addition
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
679371e397
feat: get carry forwarded leaves via ledger entries
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
2b421c39b5
feat: add transaction details in ledger
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
1de990b2ac
feat: create leave ledger entry
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5e2b067107
feat: display carry forwarded allocation days and total leaves allocated
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0abf5d340c
fix: carry forwarded allocation period validation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d01863707c
test: pass leave type as params
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
70cf4a6796
feat: validate leave allocation period to be within expiry limits
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
99c9cfaaed
feat: generate leave allocation for carry forwarded leaves
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
4badca54af
feat: validate leave expiry days
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0c0bfb1ef0
feat: calculate carry forward leaves allocation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d6c5b6320f
feat: add a field for conditionally displaying carry forwarded leave
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
e46d3a87ea
feat: set carry forwarded leave allocation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
c28d2e4b2a
test: create leave allocation check
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
bd3b3ea12c
test: create leave type
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
7c6b6eae5b
feat: set leave allocation on carry forward check
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
1208ca6a36
feat: add old leaves to track carry forward leave allocation
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
c182a5687e
feat: add validation for carry forward leave expiry
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
fd53c64d5d
feat: create carried forward leave expiry option
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766
fix: Create property setter for budget if dimension is created
2019-05-15 12:20:37 +05:30
Saurabh
9da57d79b5
fix: reload docs before creating custom fields ( #17586 )
2019-05-15 11:39:41 +05:30
Mohamed Al Zubaidi
4c0f754a96
Fix typos ( #17601 )
2019-05-15 11:38:56 +05:30
Karthikeyan S
c3779851e4
fix(HR Settings): Unable to save HR Settings ( #17608 )
2019-05-15 11:38:20 +05:30
rohitwaghchaure
d07a3e1de2
fix: limit offset was missing in the get_delivery_notes_to_be_billed method ( #17611 )
2019-05-15 07:46:28 +05:30
rohitwaghchaure
32d91b2c00
fix: not able to create the sales invoice without item code ( #17612 )
2019-05-15 07:41:44 +05:30
Himanshu
abcb6aea00
fix: do not remove assignment when closed ( #17613 )
2019-05-14 20:07:53 +00:00
Mangesh-Khairnar
cf71a84976
style: formatting changes
2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736
fix: reload doc on generation of text file
2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6
feat: add account field in payment order
2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
557419a745
feat: load company bank account
2019-05-14 18:30:19 +05:30
Mangesh-Khairnar
d9140dc772
feat: add party bank account field
2019-05-14 18:28:24 +05:30
Mangesh-Khairnar
6175eb2cf9
feat: add validation for fields
2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
deepeshgarg007
60f4dd0736
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-14 15:51:12 +05:30
Anurag Mishra
52f31d211d
Merge branch 'develop' into bom_items_and_scraps
2019-05-14 15:29:43 +05:30
Shivam Mishra
621cdeb36a
Merge pull request #17592 from scmmishra/acad-fixes
...
fix: bug fixes in LMS
2019-05-14 15:20:22 +05:30
Anurag Mishra
f1f2a3eed0
feat: added report for showinrg complete hierarchy of bom with item details and scraps
2019-05-14 15:04:26 +05:30
Saurabh
1d90ebb16a
Merge pull request #17579 from rmehta/remove-feedback-trigger
...
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216
fix: Commified function to get dimensions
2019-05-14 08:50:45 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
dbf9251324
Merge branch 'develop' into blanket_order_in_selling_module_page
2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10
feat: Added Link to Blanket Orded in Selling Module Page
2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859
fix: remove link to feedback trigger
2019-05-13 14:19:09 +05:30
Saurabh
9706aaab65
Merge pull request #17556 from Alchez/develop-lead-import-fix
...
feat(crm): Allow leads to be imported without person name
2019-05-13 12:10:12 +05:30
Saurabh
1ab0b78ece
Merge pull request #17569 from Mangesh-Khairnar/training-event-fix
...
feat: validate training event period
2019-05-13 11:47:39 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
...
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
deepeshgarg007
0c874d915b
fix: Indentation fixes
2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63
fix: Show all territories and items in inactive sales item report
2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1
fix: Added dimensions in financial reports and general ledger
2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
b4e8128fdb
feat: validate training event period
2019-05-11 23:26:47 +05:30
Mangesh-Khairnar
4df61b1495
fix: join multiple emails
2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
cd4289e10e
feat: remove button on import of an order
2019-05-11 20:04:03 +05:30
Himanshu Warekar
c4fe98391b
fix: set now_datetime
2019-05-11 09:38:08 +05:30
Himanshu Warekar
a8f9698082
fix: call the correct function
2019-05-11 00:01:43 +05:30
Himanshu Warekar
6e6148be39
fix: calculate variance
2019-05-10 23:49:42 +05:30
Rohan Bansal
9778ff8ab3
feat(crm): Allow leads to be imported without person name
2019-05-10 16:09:48 +05:30
Suraj Shetty
b68ae15dec
fix: Check permissions before renaming the account
2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05
fix: Show "Merge Account" button only to users with write access
2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382
fix: test cases
2019-05-10 14:31:07 +05:30
Saurabh
a15908f6a3
Merge pull request #17542 from rohitwaghchaure/project_update_statue_emails_sending_frequestly_develop
...
fix: project update status emails sent frequently
2019-05-10 13:24:50 +05:30
rohitwaghchaure
490411ba28
Update project.py
2019-05-10 12:03:20 +05:30
Saurabh
b10392134d
Merge pull request #17544 from surajshetty3416/improve-item-search-perf
...
perf: Index show_in_website field for faster item search
2019-05-10 11:54:54 +05:30
rohitwaghchaure
8b7a5133a6
Merge pull request #17522 from rohitwaghchaure/invoiced_items_gross_margin_api_develop
...
feat: Get invoiced item's gross margin using API
2019-05-09 19:57:02 +05:30
Rohit Waghchaure
4a267b9340
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-09 19:52:53 +05:30
Suraj Shetty
2df91addd7
perf: Index show_in_website field for faster item search
2019-05-09 19:19:34 +05:30
Rohit Waghchaure
6b9543b213
fix: project update status emails sent frequently
2019-05-09 19:06:31 +05:30
Aditya Hase
5f1632cf1f
fix(hr): Use event_status instead of status
...
Training Feedback DocType has event_status field (not status)
This was broken since PR #10379 , PR #17197 made this failure explicit.
2019-05-09 19:00:05 +05:30
sahil28297
ce82e4fd54
Merge branch 'develop' into sync_site_develop
2019-05-09 14:48:39 +05:30
deepeshgarg007
9a05ce10d9
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-09 14:43:45 +05:30
Sahil Khan
73e281d339
feat(sync_site): return more data in level
2019-05-09 14:32:15 +05:30
Mangesh-Khairnar
93c9a99548
style: change formatting
2019-05-09 12:23:24 +05:30
deepeshgarg007
19c8802971
fix: Precision fixes in gstr3b-report
2019-05-09 12:15:56 +05:30
deepeshgarg007
2097916d9e
fix: Invoice type fixes in gstr-1 report
2019-05-09 12:15:29 +05:30
Saurabh
2b6b504f30
Merge branch 'develop' into invoiced_items_gross_margin_api_develop
2019-05-09 12:06:12 +05:30
Himanshu Warekar
488432c0e8
fix: display sla status
2019-05-09 11:50:09 +05:30
rohitwaghchaure
4d2c307d6d
Merge pull request #17475 from netchampfaris/item-variant-attributes-optional
...
fix: Allow variant attributes to be optional
2019-05-09 00:54:45 +05:30
Deepesh Garg
35226b1f32
Merge pull request #17415 from deepeshgarg007/notification
...
feat: Track purchase receipt status in material request
2019-05-09 00:03:34 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips ( #17380 )
...
* feat: Added check for encrypting salary slips and password policy field
* feat: make password policy mandatory if encrypt option is selected
* feat: added password logic to email_salary_slip
* fix: import error
* chore: Minor enhancement to validations in salary slip
* fix: travis patch
* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Mangesh-Khairnar
644e181729
feat: remove first row if empty
2019-05-08 16:17:31 +05:30
Mangesh-Khairnar
3ca8976037
feat: add validation for fetching doc status
2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805
feat: add status field to create payment order
2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858
feat: assign pe status on creation of payment order
2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf
fix: display generate txt on submission
2019-05-08 15:58:26 +05:30
Mangesh-Khairnar
0b2fc4fbc1
fix: multiple changes
2019-05-08 15:57:29 +05:30
Rohit Waghchaure
7bee502d72
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d
feat: Get invoiced item's gross margin using API
2019-05-08 15:38:05 +05:30
Rohit Waghchaure
0cb7024e55
fix: job card issue, added validation in the stock entry
2019-05-08 15:14:12 +05:30
Saurabh
27e7ae6773
Merge branch 'develop' into procurement-tracker
2019-05-08 11:30:38 +05:30
deepeshgarg007
321124aa72
fix: Resolve merge conflict in json files
2019-05-08 10:33:08 +05:30
deepeshgarg007
e13a56cc80
Merge branch develop into notification
2019-05-08 10:16:30 +05:30
Himanshu Warekar
5aba75d74d
fix: show priority change dialog
2019-05-08 00:22:26 +05:30
Himanshu Warekar
91478181cb
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-07 23:43:06 +05:30
Himanshu Warekar
fc3232a9db
fix: compare timedeltas directly
2019-05-07 23:42:38 +05:30
Anurag Mishra
c3dcf02784
test: subcontracted raw materials to be recieved
2019-05-07 17:43:48 +05:30
Anurag Mishra
58bd2df834
fix: code refactor
2019-05-07 17:42:22 +05:30
Anurag Mishra
9acb2bf28f
test: for subcontracting item be received
2019-05-07 14:38:30 +05:30
Faris Ansari
9a45bd11d6
Merge branch 'develop' into item-variant-attributes-optional
2019-05-07 14:25:03 +05:30
Faris Ansari
fde4fa7b60
fix(test): Convert values to list
2019-05-07 13:29:00 +05:30
Faris Ansari
23fecc0dbb
perf: Task import with Project ( #17496 )
...
When tasks are imported with their Project set, import slows down as
number of tasks increase. This is largely due to `load_tasks` being
called in Project which is only required when Form loads. So, we can
skip it during import.
Also, converted some get_doc calls to get_cached_doc.
2019-05-07 12:38:24 +05:30
Faris Ansari
a90fe810b3
fix(UX): Cancel tasks if project is cancelled ( #17497 )
2019-05-07 12:37:38 +05:30
Mangesh-Khairnar
b8d0dec7f5
feat: filter bank from company account
2019-05-07 11:29:20 +05:30
Himanshu Warekar
1bfef6a600
fix: code fixes
2019-05-07 10:46:52 +05:30
Himanshu Warekar
9563835b61
fix: miscellaneous fixes
2019-05-07 10:40:02 +05:30
Himanshu Warekar
cf37e401f8
fix: change agreement status only if ongoing
2019-05-07 10:27:01 +05:30
Himanshu Warekar
c5999154e6
fix: test cases and use orm
2019-05-06 23:43:16 +05:30
Mangesh-Khairnar
e8bea2e936
feat: set payment order type on mapping
2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce
feat: show generate txt button for payment entry
2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
27ea171187
style: change formatting
2019-05-06 16:37:34 +05:30
Mangesh-Khairnar
66a3c99800
feat: fetch custom fields for remittance creation
2019-05-06 16:26:05 +05:30
Mangesh-Khairnar
9215de02c5
feat: add india specific custom fields in company
2019-05-06 16:24:10 +05:30
Faris Ansari
ff9177a6ce
fix: Handle attribute filter when no items found
2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed
fix: Dont include disabled items in cache
2019-05-06 15:59:34 +05:30
Mangesh-Khairnar
09d4933edb
fix: filter pi item based on po completeion
2019-05-06 12:53:52 +05:30
Himanshu Warekar
aa0eaab3df
fix: codacy
2019-05-06 01:35:11 +05:30
Himanshu Warekar
785f98efd9
minor: change autoname for sla
2019-05-06 00:43:38 +05:30
Himanshu Warekar
9faaa17d9d
patch: fixes
2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1
fix: test cases for sla
2019-05-05 22:51:18 +05:30
Mangesh-Khairnar
525d8cefc1
fix: post process mapping
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b
feat: generate file name
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b
feat: check bulk update option
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8
feat: add advice row
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb
fix: pass account paid information to postprocess
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
b89db7f5a8
feat: add logic to generate txt file
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2
feat: add payment entry field
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364
perf: improve mapping function speed
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478
feat: add generate txt file button for india region
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c
feat: add mapping logic for creating payment order
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189
feat: create payment order from payment entry
2019-05-05 22:37:20 +05:30
Himanshu Warekar
fbb7ea4856
fix: patch fix
2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604
fix: patch fixes
2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191
patch: fix to migrate to new sla structure
2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831
patch: migrate to new sla structure
2019-05-05 12:31:04 +05:30
Himanshu Warekar
b3070ca765
fix: display sla indicators at the top
2019-05-05 12:19:08 +05:30
Himanshu Warekar
898ab61dd4
fix: Child table for priority
2019-05-04 23:16:02 +05:30
Himanshu
ac1ce5d205
fix: Remove Scheduling Tool if exists ( #17473 )
...
* fix: scheduling tool
* fix: patch for scheduling tool
* fix: remve drop table
2019-05-04 22:43:37 +05:30
Rohan
174aa24529
fix(stock): Allow expired batches to be flushed out of the system ( #17478 )
2019-05-04 22:41:05 +05:30
Rushabh Mehta
e12bedc0c2
fix: unlink task rather than deleting it ( #17485 )
2019-05-04 22:39:31 +05:30
Faris Ansari
14425575b7
fix: Rebuild cache in background ( #17487 )
2019-05-04 22:38:13 +05:30
Himanshu
5cf12a4640
fix(Purchase Order): fetch payment terms ( #17121 )
...
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
2019-05-04 22:37:35 +05:30
Himanshu Warekar
24442af9ae
fix: use list comprehension
2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5
fix: calculate percentage only if sales team exist
2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347
fix: sales percentage equal to 100
2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c
fix: python side validation
2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f
fix: validate percentage total
2019-05-04 22:35:52 +05:30
deepeshgarg007
b4ad5c0158
feat: Ability to add custom dimensions
2019-05-04 20:29:21 +05:30
Rushabh Mehta
2df16b1f9b
fix(style): demo home page
2019-05-04 11:09:19 +05:30
Mangesh-Khairnar
e003cc8812
fix: filter out completed purchase receipt
2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a
feat: add date range filters
2019-05-03 16:00:02 +05:30
Anurag Mishra
d0cdb4a1e9
feat: subcontracting report
2019-05-03 14:05:29 +05:30
Faris Ansari
ab14892fc5
fix: Variant naming if optional attributes
2019-05-03 13:57:20 +05:30
Faris Ansari
cb03bb1c00
fix: Allow variant attributes to be optional
2019-05-03 13:41:50 +05:30
Himanshu Warekar
00a494f07b
fix: change sla on priority
2019-05-03 12:44:35 +05:30
Deepesh Garg
8ca3df7aac
Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop
...
fix: Inactive sales items report fix
2019-05-03 11:54:05 +05:30
deepeshgarg007
3c1b9aa77b
fix: Remove patch
2019-05-03 09:47:38 +05:30
Nabin Hait
f13abe8332
Merge pull request #17464 from Mangesh-Khairnar/task-unlink
...
feat: unlink task from project on task deletion
2019-05-03 09:20:34 +05:30
deepeshgarg007
6c6b24011f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop
2019-05-02 23:03:59 +05:30
Faris Ansari
b9dc4687dc
fix: Remove parens
2019-05-02 20:14:16 +05:30
deepeshgarg007
9ae112bbfc
fix: Inactive items report fix
2019-05-02 19:38:15 +05:30
Mangesh-Khairnar
ffd4990a70
feat: unlink task from project on task deletion
2019-05-02 19:19:03 +05:30
Nabin Hait
73041269e9
refactor: Project and billing summary
2019-05-02 18:13:31 +05:30
Suraj Shetty
8b0588deaf
feat: Init call summary popup
2019-05-02 14:59:44 +05:30
Nabin Hait
bd0d10f82a
Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev
...
fix: Multilingual handling in woocommerce integration
2019-05-02 12:57:34 +05:30
Nabin Hait
218d551c99
Merge pull request #17105 from nabinhait/gst-category-fieldtype
...
fix: Set GST Category fieldtype as Select in invoice
2019-05-02 12:43:09 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev
2019-05-02 12:01:46 +05:30
Nabin Hait
5a7c5bc4dd
Merge pull request #17435 from rmehta/coa-sorting
...
fix(minor): chart of accounts sorting and message
2019-05-02 11:57:08 +05:30
Saurabh
321c0feed8
Merge branch 'develop' into woocommerce-multilingual-fix-dev
2019-05-02 11:46:53 +05:30
Rushabh Mehta
27a30c842d
fix: simplify sort condition
2019-05-02 09:23:56 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
...
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30
Nabin Hait
9cce19a65c
Merge pull request #17438 from netchampfaris/cart-route
...
fix(cart): Don't use window.open as it can be blocked
2019-05-02 03:17:58 +05:30
Nabin Hait
c0fdb80486
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-02 01:00:12 +05:30
Nabin Hait
e93702032b
Merge branch 'develop' into task-depends-on-code
2019-05-02 00:59:23 +05:30
Nabin Hait
bbcf43961c
Merge branch 'develop' into cart-route
2019-05-02 00:59:13 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting
2019-05-02 00:58:56 +05:30
Nabin Hait
d539def25d
Update campaign.json
2019-05-02 00:44:29 +05:30
Nabin Hait
9d04b67f46
fix: Validate parent account of child company while creating new account based on parent company
2019-05-01 20:26:36 +05:30
Nabin Hait
4ee2cec8e2
Merge pull request #17444 from nabinhait/work-order-bom-image-dev
...
feat: Added item image in work order and bom
2019-05-01 19:31:15 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
Nabin Hait
64346c08c6
Merge pull request #17446 from netchampfaris/product-configurator-skip-disabled-items
...
fix: Skip disabled items in product configurator
2019-05-01 19:27:59 +05:30
Nabin Hait
c64cc331b7
Update item_variants_cache.py
2019-05-01 19:27:23 +05:30
Nabin Hait
284e5a284e
Update item_variants_cache.py
2019-05-01 19:26:56 +05:30
Nabin Hait
240008d7c6
fix: Multilingual handling in woocommerce integration
2019-05-01 19:18:40 +05:30
Faris Ansari
4ca948d7ea
fix: Skip disabled items in product configurator
2019-05-01 18:19:24 +05:30
deepeshgarg007
1cfe96193f
Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop
2019-05-01 18:14:07 +05:30
deepeshgarg007
75afff2f6d
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-05-01 18:05:11 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
deepeshgarg007
c5e6886937
feat: Notification for material request receipt
2019-05-01 18:03:40 +05:30
Nabin Hait
621006642c
feat: Added item image in work order and bom
2019-05-01 17:20:21 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
...
fix: Always fetch exchange rate from ref document
2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc
...
fix: Python 3 compatibility fixes
2019-05-01 16:45:11 +05:30
deepeshgarg007
bffa060ff6
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-05-01 16:33:11 +05:30
Nabin Hait
6d9334810e
fix: reverted fetch from as the field does not exists for some ref doctypes
2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0
fix: Always fetch exchange rate from ref document
2019-05-01 15:37:03 +05:30
Nabin Hait
0af45b41d7
Merge pull request #17426 from adityahase/fix-py3-regional-france
...
fix(py3): Undefined variable
2019-05-01 15:05:24 +05:30
Nabin Hait
41423815a7
Merge pull request #17431 from nabinhait/deferred-accounting-long-job-dev
...
fix: moved deferred accounting monthly job to long job
2019-05-01 15:04:12 +05:30
Faris Ansari
358329d7df
fix: Hide button and cart after success
2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16
fix(cart): Don't use window.open as it can be blocked
...
window.open calls are interpreted as popups by some browsers and are
blocked.
Also, route to Quotation web view instead of printview.
2019-05-01 14:32:15 +05:30
Nabin Hait
89b06132cd
minor fix
2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3
fix: Set GST Category fieldtype as Select in invoice
2019-05-01 14:18:37 +05:30
deepeshgarg007
6dfbd2bb64
fix: Delete old report
2019-05-01 14:17:16 +05:30
deepeshgarg007
db999e293b
fix: Rename Inactive Items report to Inactive Sales Item
2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11
fix(minor): chart of accounts sorting and message
2019-05-01 13:53:05 +05:30
Nabin Hait
cc6ee8e16e
Merge pull request #17154 from nabinhait/item-discount
...
fix: Calculate rate based on discount on server side, only if not rate or pricing rule applied
2019-05-01 13:44:21 +05:30
Nabin Hait
4c724dc3cb
Merge pull request #17428 from nabinhait/ss-fixes-dev
...
Few fixes in payroll
2019-05-01 13:44:05 +05:30
Nabin Hait
991b95fbec
Merge pull request #17434 from nabinhait/payment-entry-exchange-rate-dev1
...
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:35:12 +05:30
Nabin Hait
316c3b3f9d
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:34:17 +05:30
Faris Ansari
7899412d9e
fix: Set depends_on_tasks to Code
...
It tracks a list of dependent tasks which can exceed 140 characters
2019-05-01 13:31:56 +05:30
Nabin Hait
b9b2a06847
moved deferred accounting monthly job to long job
2019-05-01 12:50:23 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Nabin Hait
5762a5d8b6
fix: Null handling
2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86
fix: a few fixes in payroll
2019-05-01 12:17:47 +05:30
Aditya Hase
e7d712934f
Merge branch 'develop' into fix-py3-asset-value-adjustment
2019-05-01 11:55:35 +05:30
Aditya Hase
5bbff9de6c
Merge branch 'develop' into fix-py3-regional-france
2019-05-01 11:55:32 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc
2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c
fix: Python 3 compatibility fixes
...
import reduce from functools
Undefined variable
2019-05-01 11:52:37 +05:30
Aditya Hase
1db334317d
fix(py3): Undefined variable
2019-05-01 11:51:04 +05:30
Aditya Hase
97ad454525
fix(py3): Undefined variable
2019-05-01 11:50:05 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
...
fix: allow_import_of_bank_account_by_account_manager
2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values
...
fix: show only party_type doctypes in Party Type field of bank account
2019-05-01 11:15:02 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report
...
feat: Loan repayment report
2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json
2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
cc8e2b6aca
test: pass filters to execute
2019-05-01 10:03:57 +05:30
Nabin Hait
dff4cce8fd
Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix
...
fix(salary-register): Track doj for non active employee
2019-05-01 09:57:28 +05:30
Karthikeyan S
6b77f6edf3
fix: woocommerce settings patch ( #17422 )
...
(cherry picked from commit 7df8c0ef82d72920aba342623dc10c5c14b1d8f8)
2019-05-01 09:07:44 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts ( #17077 )
...
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price ( #17386 )
...
* fix: Price list for UOM other than stock UOM
-Fixes conversion from default UOM item price to other UOMs
* fix: Typo
2019-04-29 23:18:47 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title ( #17403 )
...
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
2019-04-29 22:41:48 +05:30
Faris Ansari
61b4afc3c5
perf: Order by name instead of parent ( #17404 )
...
Changing the order by column reduced the query time from 60s to 12s
2019-04-29 22:41:24 +05:30
Basawaraj Savalagi
d4585efc6a
feat: Additional fields in campaign
2019-04-29 22:12:50 +05:30
deepeshgarg007
36e161df74
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-29 21:44:51 +05:30
deepeshgarg007
f2fb0e03e6
fix: Add status for partial received
2019-04-29 21:42:48 +05:30
Rushabh Mehta
9f660267c1
Merge pull request #17397 from Thunderbottom/manufacturing-demo-fix
...
fix(demo): make demo work again
2019-04-29 15:18:28 +05:30
Rushabh Mehta
1efade3408
fix(task): weight editable
2019-04-29 15:00:20 +05:30
Syed Mujeer Hashmi
b146df6460
feat: Student Group with Student Category filter
...
The Student Category field is added to the Student Group doctype.The
students are fetched from Program Enrollment with added Student Category.
This helps in creating student group based on Program,Batch and Student
Category.Which helps in creating fee schedule with fee structures
defined based on student category.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2019-04-29 13:16:00 +05:30
Aditya Hase
8afeda924d
fix: Use all address lines instead of only first two
2019-04-29 13:09:23 +05:30
Mangesh-Khairnar
513e3f97e5
fix(salary-register): track doj for non active employee
2019-04-29 12:17:49 +05:30
Aditya Hase
ba61be93ae
refactor: Major changes
2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784
feat(tally): Preprocess and create items and uoms
2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b
fix(tally): Use LEDSTATENAME instead of STATENAME
2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638
feat(tally): Preprocess and create parties and addresses
2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82
feat(tally): Create chart of accounts from tally master data
2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad
feat(tally): Preprocess master data to generate COA
2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0
feat(tally): Add Tally Migration DocType
2019-04-28 19:24:58 +05:30
Mangesh-Khairnar
96661ba847
feat: add filters for multiple company operation
2019-04-28 17:11:28 +05:30
Chinmay Pai
b503896594
fix(demo): make demo work again
...
definitely not a maga rebranding.
* import erpnext and set default company for accounts
* replace job card start/end date with job card time log
* create a doc for lost_reason
* pass opportunity/quotation lost_reason as a list of dicts
* fix company in stock reconciliation
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-04-27 01:39:50 +05:30
deepeshgarg007
c23b70950e
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-26 16:43:06 +05:30
Mangesh-Khairnar
9cd9671bb5
fix: minor changes
2019-04-26 16:02:25 +05:30
ashish-greycube
e4e8197f46
codacy review
2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03
fix : allow_import_of_bank_account_by_account_manager
2019-04-26 12:42:14 +05:30
ashish-greycube
4707ad2029
fix: copy_payment_schedule_from_quot_to_SO
2019-04-26 12:14:40 +05:30
rohitwaghchaure
fa626bd3ab
Merge pull request #17372 from rohitwaghchaure/fix_straight_line_asset_depreciation_develop_v12
...
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-26 12:04:32 +05:30
ashish-greycube
467609b193
show only party_type doctypes in Party Type field of bank account
2019-04-26 11:35:04 +05:30
Shivam Mishra
377b230e41
Merge branch 'develop' into lms-fixes-1
2019-04-26 08:42:33 +05:30
Mangesh-Khairnar
da7b1673c3
test: track pi and pr changes
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
869544c0bc
fix: add mapped records as functions
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
438fa620b0
feat: fetch purchase invoice and purchase receipt records for actual cost calculation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
fcd0edf415
test: compare expected data to generated data
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
46b9204e9d
feat: fetch data from budget records for cost estimation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
5de08f71c5
feat: fetch all required fields from po
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
69909c0f51
feat: create procurement tracker report
2019-04-26 01:31:16 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po
...
feat: Automatic inter company Sales and Purchase order
2019-04-26 00:24:08 +05:30
Nabin Hait
5c4b7b32a1
Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic
...
fix: Order Item attribute values dynamically
2019-04-26 00:21:39 +05:30
Nabin Hait
4c31acf5e4
Merge pull request #17382 from nabinhait/tax-exemption-dev
...
refactor: Employee Tax Exemption (develop)
2019-04-26 00:20:46 +05:30
Nabin Hait
ec7a18737b
fix: test cases
2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d
fix: test cases
2019-04-25 21:42:26 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
...
fix: Trial balance finance book issue
2019-04-25 20:34:38 +05:30
Nabin Hait
49446ba760
fix: test cases
2019-04-25 19:54:49 +05:30
Shivam Mishra
9fe7257bfc
fix (ui): refactored breadcrumbs
2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb
fix (ui): Card layout
2019-04-25 19:33:22 +05:30
Shivam Mishra
37a55345fd
feat: removed home page for lms role
2019-04-25 19:29:56 +05:30
Nabin Hait
04e7bf464f
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
Nabin Hait
e70696e111
Merge branch 'develop' into pos-advance-dev
2019-04-25 17:53:56 +05:30
Rohit Waghchaure
c181064782
fix: Trial balance finance book issue
2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8
fix: Don't allocate advance if pos
2019-04-25 17:49:38 +05:30
deepeshgarg007
ce809d57a2
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 14:29:31 +05:30
deepeshgarg007
f34e4f0e36
fix: Test case for inter-company-transaction
2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Faris Ansari
dd201b0797
fix: Order Item attribute values dynamically
2019-04-25 13:03:50 +05:30
Rohit Waghchaure
9c1fa77f4e
fixed test cases
2019-04-25 11:57:27 +05:30
Rohit Waghchaure
691e03a36b
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-25 11:57:20 +05:30
Nabin Hait
07e005f963
Merge pull request #17350 from nabinhait/item-tax-patch
...
fix: create account if not exists in item tax patch
2019-04-25 10:40:46 +05:30
Nabin Hait
8784b0b134
Update move_item_tax_to_item_tax_template.py
2019-04-25 10:40:34 +05:30
deepeshgarg007
fef14182b7
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 08:27:40 +05:30
Saif Ur Rehman
f1da53ed01
fix(Product Bundle Balance): Remove custom roles
2019-04-25 00:14:14 +05:00
Nabin Hait
2cb57dc3e7
Update move_item_tax_to_item_tax_template.py
2019-04-24 23:34:04 +05:30
Nabin Hait
d828f84da6
Merge pull request #17359 from netchampfaris/item-attribute-order-fix
...
fix: Item Attribute Order
2019-04-24 23:16:34 +05:30
Deepesh Garg
ea9c758648
Merge pull request #17331 from deepeshgarg007/inactive_items
...
feat: Inactive items report
2019-04-24 22:30:54 +05:30
Saif Ur Rehman
a012b63f9b
style: linting
2019-04-24 16:17:40 +05:00
Saif Ur Rehman
adc738f55d
style: linting
2019-04-24 14:43:46 +05:00
Saif Ur Rehman
35887f1c0a
feat: Product Bundle Balance Report
2019-04-24 13:37:25 +05:00
Faris Ansari
90d7150859
Merge branch 'develop' into item-attribute-order-fix
2019-04-24 11:58:27 +05:30
Faris Ansari
cb7ca63979
fix: Item Attribute Order fix
2019-04-24 11:57:40 +05:30
scmmishra
bf7d13a7be
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-04-24 09:50:19 +05:30
Nabin Hait
0908907ae1
Merge branch 'develop' into aahi_loan_report
2019-04-24 09:37:52 +05:30
Nabin Hait
43324179d0
Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed
...
fix: Subject of Stock Entry feed
2019-04-24 09:35:18 +05:30
Nabin Hait
08da372ae5
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-24 09:19:21 +05:30
Nabin Hait
8d3644d826
Merge pull request #17351 from nabinhait/rounded-salary-tax
...
fix: Rounded tax amount in salary slip
2019-04-24 09:19:00 +05:30
Deepesh Garg
719dc506b9
Merge pull request #17352 from nabinhait/pos-advance
...
fix: don't allocate advances if POS
2019-04-24 08:18:05 +05:30
Deepesh Garg
7dddc0c5bf
Merge branch 'develop' into fix-stock-entry-feed
2019-04-24 08:14:10 +05:30
Deepesh Garg
12af1c3837
Merge branch 'develop' into employee-skill-map
2019-04-24 00:03:04 +05:30
Rohan
d12e9426bd
fix(selling): Fix method to also consider return documents ( #17340 )
2019-04-23 23:08:26 +05:30
Nabin Hait
aa028d7856
fix: don't allocate advances if POS
2019-04-23 21:44:21 +05:30
Nabin Hait
c144f66dac
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-23 21:39:33 +05:30
Nabin Hait
90bca999dd
Merge branch 'develop' into inactive_items
2019-04-23 21:39:22 +05:30
Nabin Hait
09438562d4
Merge branch 'develop' into fix-stock-entry-feed
2019-04-23 21:39:04 +05:30
Nabin Hait
80a5cb3dcc
Merge branch 'develop' into item-tax-patch
2019-04-23 21:38:45 +05:30
Nabin Hait
acac41d62b
Merge branch 'develop' into rounded-salary-tax
2019-04-23 21:38:16 +05:30
Nabin Hait
5e0bc20ab8
Merge pull request #17337 from nabinhait/travis-fix-dev
...
fix: Load doc before save
2019-04-23 21:35:18 +05:30
Audacityy
bf8d3658c9
Issue form reorder ( #17346 )
...
* fix: Issue form reorder
2019-04-23 18:55:42 +05:30
Nabin Hait
553a3ea7d2
fix: create account if not exists in item tax patch
2019-04-23 18:46:17 +05:30
Nabin Hait
1f61a1ecf2
minot fix
2019-04-23 18:44:57 +05:30
Nabin Hait
6592a6bcd4
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-23 18:38:54 +05:30
Nabin Hait
8bbc0a0c3b
Merge branch 'develop' into inactive_items
2019-04-23 18:38:44 +05:30
Deepesh Garg
cb2c13fa50
fix: Stock Ledger report fix ( #17343 )
2019-04-23 17:29:59 +05:30
Nabin Hait
24b4a8722e
fix: Rounded tax amount in salary slip
2019-04-23 15:54:32 +05:30
Kanchan Chauhan
253c6f962d
fix: Subject of Stock Entry feed
2019-04-23 14:40:02 +05:30
Nabin Hait
64bfdd9596
fix: test cases
2019-04-23 13:37:19 +05:30
Nabin Hait
593242fa5c
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
2019-04-23 13:22:38 +05:30
Nabin Hait
319c912f91
fix: Load doc before save
2019-04-23 13:13:36 +05:30
Rushabh Mehta
77b82894ff
fix(style): buttons in address and contact
2019-04-23 07:57:31 +05:30
Suraj Shetty
df59c1573d
feat: Add training date field
2019-04-22 23:35:36 +05:30
deepeshgarg007
e3ea806390
fix: Ignore sql injections
2019-04-22 21:08:29 +05:30
deepeshgarg007
d5e7bf8f0f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-22 21:07:27 +05:30
deepeshgarg007
4f57328924
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-22 20:25:41 +05:30
deepeshgarg007
555f425da1
fix: Test case and styling fixes
2019-04-22 20:24:31 +05:30
Deepesh Garg
2ef7022385
fix: Remove print statements ( #17333 )
2019-04-22 19:25:18 +05:30
scmmishra
936f36ccda
fix: import frappe._ in lms.py
2019-04-22 18:55:19 +05:30
scmmishra
68b3203366
chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment
2019-04-22 18:50:08 +05:30
scmmishra
3673b25b64
fix: quiz is now visible to administrator
2019-04-22 18:10:19 +05:30
deepeshgarg007
d249325d98
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-22 18:00:13 +05:30
deepeshgarg007
a89d1df655
fix: Typo fixes
2019-04-22 17:54:38 +05:30
scmmishra
804a74c01c
fix (ui): UI fixes to Video page
2019-04-22 17:52:48 +05:30
scmmishra
6c8f23b27e
fixed (ui): Fixed cards with better buttons
2019-04-22 17:51:30 +05:30
Nabin Hait
7f4e7b63d7
fix: Income tax period factor considering joining and relieving date
2019-04-22 17:39:36 +05:30
deepeshgarg007
bf2adae97d
fix: Ordering and datatype fixes in inactive items report
2019-04-22 17:15:23 +05:30
deepeshgarg007
8a5d556f53
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-22 16:59:33 +05:30
deepeshgarg007
425699d9f2
fix: Material request list_view status fixes
2019-04-22 16:54:52 +05:30
Nabin Hait
af309473f8
Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop
...
fix: moved erpnext related methods from frappe to erpnext(cherry-picked)
2019-04-22 15:59:30 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes
...
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Nabin Hait
28a7aec124
Update accounting.py
2019-04-22 15:35:13 +05:30
deepeshgarg007
6f57b05fed
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-22 15:26:55 +05:30
Rushabh Mehta
3bf71cc18e
fix(splash): revert to old image
2019-04-22 15:24:28 +05:30
Deepesh Garg
15a7b7ce71
fix: GSTR 3b report fixes ( #17317 )
...
* fix: GSTR-3b report total taxable value fixes
* fix: Test Cases
2019-04-22 15:22:36 +05:30
scmmishra
5079e6c1c1
chore: minor improvements
2019-04-22 14:48:32 +05:30
scmmishra
ac8d3479c9
feat: Added add_quiz_activity function to course_enrollment class
2019-04-22 14:38:51 +05:30
scmmishra
33969b7d7c
chore: Minor change to question doctype
2019-04-22 14:30:14 +05:30
Rohit Waghchaure
270d4e9f4e
fix: moved erpnext related methods from frappe to erpnext
2019-04-22 14:11:43 +05:30
scmmishra
66d239281c
chore: minor code improvements
2019-04-22 14:10:09 +05:30
Nabin Hait
d3cd98c45e
fix: Renamed depends_on_lwp to depends_on_payment_days
2019-04-22 13:45:45 +05:30
Nabin Hait
452f2c5694
Merge pull request #17322 from nabinhait/salary-structure-child-docstatus
...
Salary structure child docstatus
2019-04-22 13:42:55 +05:30
Nabin Hait
36561801c2
Update set_salary_details_submitable.py
2019-04-22 13:38:06 +05:30
Anurag Mishra
35e52b5596
fix: fixed spelling
2019-04-22 13:37:03 +05:30
Saif Ur Rehman
a216844d2c
fix: Set Allocate Advance Automatically disabled by default
2019-04-22 12:10:40 +05:00
scmmishra
64d2fe0ad7
fix: Minor typo
2019-04-22 12:30:08 +05:30
scmmishra
4add826703
chore: Minor code improvements
...
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
2019-04-22 12:28:13 +05:30
deepeshgarg007
06c20400ee
feat: Track purchase receipt status in Material Request
2019-04-22 12:25:14 +05:30
scmmishra
da2c90cd18
chore: renamed get_program api functions
...
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
2019-04-22 12:21:40 +05:30
scmmishra
9967d27b9a
chore: renamed ambiguous variable names in lms.py
2019-04-22 12:08:41 +05:30
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes ( #17242 )
...
- Rename Server to Jinja
- Rename Js to JS
2019-04-22 12:08:18 +05:30
scmmishra
d78c326f95
chore: renamed get_topic_meta to get_student_topic_details
2019-04-22 12:06:28 +05:30
scmmishra
d5973fe4bc
chore: renamed get_course_meta to get_student_course_details
2019-04-22 12:05:22 +05:30
scmmishra
327334a830
chore: refactor utils.get_current_student
2019-04-22 12:03:17 +05:30
scmmishra
823d89cf66
fix (linting): codacy fixes
2019-04-22 11:46:22 +05:30
Nabin Hait
89d3aaf349
Merge pull request #17310 from nabinhait/ar-fix-develop
...
fix: Total row alignment in AR report
2019-04-22 11:11:38 +05:30
Suraj Shetty
2a9b17efd4
Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map
2019-04-21 23:53:54 +05:30
Suraj Shetty
079684f7da
feat: Task type ( #17311 )
...
* feat: Add task type doctype
2019-04-20 23:37:49 +05:30
Nabin Hait
d21bacfc21
fix: Total row alignment in AR report
2019-04-20 10:58:58 +05:30
Nabin Hait
65b3a849d3
Merge pull request #17306 from surajshetty3416/fix-employee-permission
...
fix: Do not create employee user permission if already exists
2019-04-20 01:44:06 +05:30
Nabin Hait
ee43f9d154
Merge pull request #17305 from nabinhait/inv-disc-fix1
...
fix: fetch party account as discounted receivable account in payment entry
2019-04-20 01:40:55 +05:30
Nabin Hait
d8783343f3
Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop
...
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)
2019-04-20 01:27:31 +05:30
Suraj Shetty
98390dae49
fix: Do not create employee user permission if already exists
2019-04-19 21:52:08 +05:30
Nabin Hait
c8b1351e87
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes
...
fix: Close loan considering latest invoice outstanding balance
2019-04-19 21:27:02 +05:30
Nabin Hait
a6e09826b3
Merge pull request #17297 from netchampfaris/index-item-route
...
fix: Add index to Item route
2019-04-19 20:11:29 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes
...
Invoice discounting fixes
2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd
fix: Close loan considering latest inv outstanding balance
2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7
fix: test cases
2019-04-19 15:10:02 +05:30
Rohit Waghchaure
72cc7508b0
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered
2019-04-19 14:57:38 +05:30
Faris Ansari
1d78aae2af
fix: Add index to Item route
...
Increases route resolve time if there are lots of Items.
2019-04-19 14:03:25 +05:30
Nabin Hait
0aa036cda5
Merge pull request #17294 from scmmishra/trial-detail-fix
...
fix: fixed trial details
2019-04-19 13:18:03 +05:30
Nabin Hait
48e1e04df2
Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop
...
fix: task name was not able to search by name in global search (Cherry-picked)
2019-04-19 13:06:42 +05:30
Prasad R
198c7ae73d
fix: show 2 missing doctypes in Accounts
2019-04-19 12:43:58 +05:30
scmmishra
a55d32236a
fix: fixed trial details
2019-04-19 12:22:30 +05:30
Prasad R
e1a6022c8c
fix: Allow system manager to access share ledger
2019-04-19 10:57:21 +05:30
Rohit Waghchaure
94f43ca2e2
fix: task name was not able to search by name in global search
2019-04-18 22:39:42 +05:30
Rohit Waghchaure
376db4f6b7
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger
2019-04-18 22:06:22 +05:30
deepeshgarg007
c841bd486a
feat: Added validations and mapper to create inter company mapper
2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af
feat: Added custom button to make inter company order
2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd
feat: Updated doctypes for sales and purchase order
2019-04-18 20:08:20 +05:30
Nabin Hait
c99c712913
fix: Validate and update invoice discounting status on JE submit/cancel
2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf
fix: Don't fetch already discounted invoice
2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2
fix: Added invoice discounting dashboard
2019-04-18 14:47:44 +05:30
Suraj Shetty
3aa5e125bd
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
deepeshgarg007
767a00fa8d
feat: Logic for query and report creation for inactive items
2019-04-18 08:45:10 +05:30
deepeshgarg007
4d1df416e9
fix: Reordered and deleted unnecessary filters
2019-04-18 08:29:21 +05:30
Nabin Hait
0050652be9
Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop
...
fix: GSTR-1 B2C Small report fix
2019-04-17 17:32:29 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
...
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Nabin Hait
26dd192516
Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop
...
fix: If finance book filter is not set then show all the entries(Cherry-pick)
2019-04-17 17:22:45 +05:30
Shivam Mishra
f3cc87455a
Merge pull request #17249 from scmmishra/auto-fetch-serial
...
feat: Auto fetch serial numbers
2019-04-17 17:15:27 +05:30
Rohit Waghchaure
38238b0cfd
fixed test cases
2019-04-17 15:56:00 +05:30
scmmishra
fed4fd0f02
style: linting issue fixed
2019-04-17 15:46:15 +05:30
Shivam Mishra
63921ebbc9
style: fixed formatting
...
Fixed formatting for for auto_fetch_serial_number
2019-04-17 15:29:29 +05:30
deepeshgarg007
cab2d82ea8
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-17 11:35:56 +05:30
scmmishra
5522cf8c26
fix: codacy linting
2019-04-17 10:26:21 +05:30
Faris Ansari
1cf9fa9662
fix: Refactor Upload Attendance ( #17241 )
...
New API frappe.ui.FileUploader
https://github.com/frappe/frappe/pull/7253
2019-04-17 09:45:46 +05:30
deepeshgarg007
9f873e97fa
fix: Remove print statement
2019-04-16 20:58:22 +05:30
deepeshgarg007
c354a17383
fix: Code cleanup
2019-04-16 20:56:49 +05:30
deepeshgarg007
e5a869bc45
fix: GSTR-1 B2CS report fix
2019-04-16 20:08:12 +05:30
Rohit Waghchaure
7aee809571
fix: If finance book filter is not set then show all the entries
2019-04-16 19:35:18 +05:30
Rohit Waghchaure
00d73cda50
fix: POS not working if user has access of multiple company
2019-04-16 18:43:16 +05:30
Rohit Waghchaure
34ee41a35e
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
2019-04-16 18:26:11 +05:30
scmmishra
6d3302b0cc
style (codacy): code formatting fixes
2019-04-16 18:25:53 +05:30
deepeshgarg007
508e815db0
feat: Added filters and columns for inactive items report
2019-04-16 17:07:13 +05:30
scmmishra
ed4b052df8
style (codacy): code formatting fixes
2019-04-16 17:03:25 +05:30
scmmishra
46901076be
feat: Use standard serial picker to add as well as update serial numbers
2019-04-16 17:01:01 +05:30
scmmishra
c791c3b24b
fix: Minor bug in serial no auto fetch api
2019-04-16 16:07:32 +05:30
scmmishra
eee5c38911
feat: Use controller for serial no. API
2019-04-16 15:57:51 +05:30
scmmishra
61d6b677e4
feat: Show standard serial number selector in item grid form
2019-04-16 15:17:27 +05:30
Rushabh Mehta
59c5a16037
fix(account_balance_timeline): remove unused import
2019-04-16 15:11:45 +05:30
scmmishra
407496b528
chore: minor changes to labels
2019-04-16 13:32:41 +05:30
Nabin Hait
0c896c38f8
Merge pull request #17244 from hrwX/delivery_note_fix_v12
...
fix(Delivery Note): show get items even if note has been amended
2019-04-16 13:20:26 +05:30
Himanshu
ef848fda2a
fix: let user delete the elements of items
2019-04-16 13:17:20 +05:30
Nabin Hait
00e9659e3f
Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated
...
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-16 12:51:13 +05:30
scmmishra
19a41ed16d
chore: code cleaning
2019-04-16 12:51:05 +05:30
scmmishra
41cf945247
feat (UX): Refactored batch selector
2019-04-16 12:47:39 +05:30
Nabin Hait
d2044c0f23
Merge pull request #17184 from frappe/akurungadam-patch-1
...
fix: misleading condition example in field options
2019-04-16 12:44:17 +05:30
scmmishra
8ec54c2214
feat: Added auto fetch serial numbers API
2019-04-16 12:20:55 +05:30
scmmishra
b98612ff5b
feat: Added auto fetch logic and button for client
2019-04-16 12:20:42 +05:30
Himanshu Warekar
810dde2e0b
fix: show get items even if note has been amended
2019-04-16 12:20:35 +05:30
Suraj Shetty
006c3dccf9
feat: Add logic to auto fetch skill from designation doc
...
- Set today as default evaluation date
2019-04-16 12:14:44 +05:30
Nabin Hait
b5199951ad
Merge pull request #17239 from nabinhait/pr-pi
...
fix: Invoice against partially returned DN/PR
2019-04-16 11:54:12 +05:30
Rushabh Mehta
1c2eb51a91
fix(api)
2019-04-16 11:12:34 +05:30
Suraj Shetty
354c70a0e7
feat: Init employee skill map doctype
2019-04-16 10:20:32 +05:30
Suraj Shetty
a0f7656ffc
feat: Add skill child table to designation doctype
...
- To record skills required of a particular designation
2019-04-16 10:19:53 +05:30
Nabin Hait
29997e2631
fix: Invoice against partially returned DN/PR
2019-04-16 09:55:42 +05:30
Nabin Hait
c066bbde06
Merge pull request #17235 from hrwX/remove_asset_permission_v12
...
fix(Asset): Remove user permission for employee in asset
2019-04-16 09:45:40 +05:30
Rushabh Mehta
6dff8038e6
fix(account_balance_timeline)
2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d
fix(account_balance_timeline)
2019-04-16 09:33:21 +05:30
Faris Ansari
557520148e
fix: Item Variant Attribute Order ( #17237 )
...
- Show Item Variant Attributes in order they appear in child table
2019-04-15 23:19:44 +05:30
Himanshu Warekar
9b7c7787e6
Merge develop
2019-04-15 22:56:41 +05:30
Himanshu Warekar
3e503f213b
fix: remove user permission for emp in asset
2019-04-15 22:50:22 +05:30
Nabin Hait
a5265113ce
Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix
...
fix(woocommerce integration): 403 error and adding defaults
2019-04-15 21:17:16 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting
...
Invoice Discounting
2019-04-15 21:14:19 +05:30
karthikeyan5
605a0a0570
fix(woocommerce integration): travis fix
...
(cherry picked from commit 2518a2ab169948cff56bfbbedbf7198327b33f25)
2019-04-15 19:47:13 +05:30
karthikeyan5
13563dc495
fix(woocommerce integration): fix strange travis error
...
the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings'
(cherry picked from commit df3e8853aeedb4991e7f8b1c878adb7ba849a063)
2019-04-15 19:47:13 +05:30
karthikeyan5
63f8cda069
fix(woocommerce integration): possible travis fix
...
possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)"
(cherry picked from commit a0b7ff60b8c3303a405c98eac11e71cd556ba166)
2019-04-15 19:47:13 +05:30
karthikeyan5
69f0ce178e
fix(woocommerce integration): error in new-site
...
resolving "Could not find UOM: Nos" error in travis
(cherry picked from commit 97383716e633ae0911238fc02ffc659ad705b41a)
2019-04-15 19:47:13 +05:30
karthikeyan5
307e6a8825
fix(woocommerce integration): defaults in settings
...
(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)
2019-04-15 19:47:02 +05:30
karthikeyan5
2b0a8de74f
fix(woocommerce integration): fixing 403 error
...
(cherry picked from commit 6784335e2ca3ea8883f08b3d94101f525f37bf1e)
2019-04-15 19:45:38 +05:30
Nabin Hait
076cc38c29
fix: Outstanding amount on making payment against discounted invoice
2019-04-15 18:42:10 +05:30
Rushabh Mehta
6aaac1e9db
fix(assign): do not assign if administrator
2019-04-15 16:58:45 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor
...
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43
Fixed merge conflict
2019-04-15 16:16:25 +05:30
Nabin Hait
fa8f13dc98
Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
...
fix: POS takes lot of time to load the items data
2019-04-15 10:11:31 +05:30
Nabin Hait
6ecc83aaf0
Merge pull request #17182 from hrwX/revert_salary_slip
...
Revert(Salary Slip): Wrong Formula
2019-04-15 10:08:53 +05:30
Nabin Hait
e7e2e93419
Merge pull request #17183 from netchampfaris/duplicate-variant-check-d
...
fix: Validate variant attributes only if is_new
2019-04-15 10:08:28 +05:30
Nabin Hait
8ab393448f
Merge pull request #17218 from netchampfaris/item-price-packing-unit-d
...
fix: Set default value for Packing Unit as 0
2019-04-15 10:06:45 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix
...
fix: handle for party type member in payment entry (v12)
2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
...
feat: Added bank account no in bank reconcilliation
2019-04-14 16:10:19 +05:30
scmmishra
5b9df676a4
fix: minor bug in breadcrumb routing
2019-04-13 18:53:49 +05:30
Deepesh Garg
1b0edbc8b3
fix: GSTR3b 3b template fix ( #17224 )
2019-04-13 18:37:08 +05:30
Anurag Mishra
95714297a4
fix: handle for party type member in payment entry
2019-04-12 15:03:46 +05:30
Suraj Shetty
c90364f94d
feat: Add task weight for employee onboarding activity ( #17216 )
...
This activity weight will be used to update the task weight
2019-04-12 14:12:03 +05:30
Faris Ansari
581e5fbfda
fix: Set default value for Packing Unit as 0
...
The default value 1 assumes Items will be always packed in integer
quantities. This is not the usual case.
2019-04-12 12:39:12 +05:30
Rushabh Mehta
54ba900e72
Merge pull request #17214 from rmehta/auto-assign-issue
...
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 11:11:59 +05:30
Nabin Hait
851acc30b3
Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue
...
fix: Fixed Sanctioned Amount Update Issue in Expense Claim
2019-04-12 11:06:02 +05:30
Nabin Hait
165e92ad5b
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
...
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-12 11:02:37 +05:30
Rushabh Mehta
4f49ce4124
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 09:04:17 +05:30
Rohit Waghchaure
2454d89068
Optimized the code to fix slow loading of items in the POS
2019-04-11 19:52:00 +05:30
Rohit Waghchaure
72cc37e8da
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-11 18:35:15 +05:30
scmmishra
ff970a8062
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-04-11 18:32:19 +05:30
Basawaraj Savalagi
9ce8c3061f
Fixed Sanctioned Amount Update Issue in Expense Claim
2019-04-11 16:30:11 +05:30
Rushabh Mehta
d625c32ab1
fix(dashboard): for frappe updates, and a new splash logo
2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
...
Feature: Purchase order on hold
2019-04-11 15:36:54 +05:30
Nabin Hait
65cca62ef9
fixed merge conflict
2019-04-11 12:32:43 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
rohitwaghchaure
92b190febb
Merge pull request #17199 from Anurag810/pos_running_items
...
fix: item order by idx in pos(v12)
2019-04-11 11:53:22 +05:30
Nabin Hait
0f62b13dd8
Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items
...
fix: sales return not working for product bundle items
2019-04-11 11:44:57 +05:30
Nabin Hait
961d7ace4a
Merge pull request #17189 from nabinhait/sales-person
...
fix: Made employee optional in sales person
2019-04-11 11:37:08 +05:30
Nabin Hait
38351587fc
Merge pull request #17197 from nabinhait/training-feedback
...
fix: training feedback code cleanup
2019-04-11 11:36:50 +05:30
Anurag Mishra
4c29d80cf1
fix: minor fixes
2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3
fix: start date and loan period should be mandatory
2019-04-11 11:08:07 +05:30
rohitwaghchaure
4898d1936b
Merge pull request #17200 from Anurag810/pos_running
...
fix: order by idx(v11)
2019-04-11 10:57:05 +05:30
rohitwaghchaure
22d6eb3eaa
Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix
...
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
2019-04-11 09:58:02 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
...
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Rohit Waghchaure
9665a531fc
fix: item variant test cases
2019-04-11 09:56:00 +05:30
scmmishra
5214c5cdb3
fix: Minor fix to test program
2019-04-10 20:37:45 +05:30
scmmishra
8c89083647
fix: test fixes for program doctype
2019-04-10 20:02:39 +05:30
scmmishra
7a1c649dbd
fix: Test fixes
2019-04-10 19:02:06 +05:30
Anurag Mishra
9a2ae67f86
fix: order by idx
2019-04-10 17:57:23 +05:30
Rohit Waghchaure
f3a9552e48
fix: item variant test cases
2019-04-10 17:57:09 +05:30
Anurag Mishra
5ab5f77fd4
fix: order by idx
2019-04-10 17:53:45 +05:30
scmmishra
d2917a8c38
feat: Fixed test data for student doctype
2019-04-10 17:50:26 +05:30
Rohit Waghchaure
49907e746b
fix: test cases
2019-04-10 17:33:32 +05:30
Rohit Waghchaure
45d0b31d44
fix: test cases
2019-04-10 17:25:08 +05:30
Rohit Waghchaure
b286fc99b8
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-10 16:16:30 +05:30
Nabin Hait
c8c678f747
fix: training feedback code cleanup
2019-04-10 15:56:16 +05:30
Basawaraj Savalagi
05458b7fc6
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-10 13:33:43 +05:30
Rohit Waghchaure
bb0d4e37b9
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
2019-04-10 03:14:11 +05:30
Nabin Hait
b305f38869
fix: Made employee optional in sales person
2019-04-09 20:06:11 +05:30
Rohit Waghchaure
30fda3ee54
feat: Added bank account no in bank reconcilliation
2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4
fix(dashboard): as per new features
2019-04-09 18:38:03 +05:30
Anoop
cb278975f3
fix: misleading condition example in field options
...
condition example corrected -
gender=\"Male\"
to
gender==\"Male\"
2019-04-09 18:10:41 +05:30
Mangesh-Khairnar
63cf56f406
style: change function call to anonymous function call
2019-04-09 17:47:25 +05:30
Faris Ansari
4da3d0015a
fix: Validate variant attributes only if is_new
2019-04-09 17:40:53 +05:30
Nabin Hait
7dcdb93596
Merge pull request #17178 from Anurag810/timesheet_report_fixes
...
fix: timesheet_report (WN-SUP41913)
2019-04-09 17:28:22 +05:30
Himanshu Warekar
5632dbdd18
revert: wrong formula
2019-04-09 16:53:54 +05:30
Rohit Waghchaure
0e9cd2e00a
feat: Production plan enhancements
2019-04-09 16:53:38 +05:30
Nabin Hait
1245139c51
Merge branch 'develop' into invoice-d
2019-04-09 15:27:13 +05:30
Anurag Mishra
67e6da2086
fix: Removed Extra page on generating pdf in print formats
2019-04-09 15:19:05 +05:30
Anurag Mishra
ef11d378d4
fix: UI on generating pdf in print format
2019-04-09 15:19:05 +05:30
Anurag Mishra
ed82e8ba3b
fix: removed before from accounts_controlle.pyr and fetch the gl from frontend
2019-04-09 15:19:05 +05:30
Anurag Mishra
b62cfffdea
fix: Print Auditing print format
2019-04-09 15:19:05 +05:30
Anurag Mishra
22867f7fa5
fix: added currency
2019-04-09 15:06:49 +05:30
Anurag Mishra
3e8b8a4359
fix: filters and some conditions
2019-04-09 14:34:56 +05:30
scmmishra
acc0fa3b00
fix: Added desciption in program test record
2019-04-09 13:20:11 +05:30
scmmishra
bae2d669b5
fix: codacy linting issues
2019-04-09 12:57:56 +05:30
scmmishra
abb35ad308
fix: Possible fix for failing tests
2019-04-09 12:38:42 +05:30
Mangesh-Khairnar
b70b048fa2
style: change type comparison for boolean expression
2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
Mangesh-Khairnar
a2facd4dd2
style: change function call to anonymous function
2019-04-09 12:07:44 +05:30
scmmishra
b7d9efe901
Merged develop in lms
2019-04-09 11:39:12 +05:30
Rushabh Mehta
0d3986c9f6
fix(dashboard): account timeline for balance sheet accounts
2019-04-09 11:36:41 +05:30
scmmishra
dd889f8796
fix: Fixed hero image field in COurse and Topic
2019-04-09 11:36:31 +05:30
Anurag Mishra
17fbafa390
fix: filters,added total,only submitted doc,considered fraction
2019-04-09 11:31:11 +05:30
Faris Ansari
aac7719dd9
fix: Translated string method in Jinja ( #17174 )
2019-04-08 21:50:58 +05:30
scmmishra
88f0c464b4
feat: Added breadcrumbs
2019-04-08 19:56:21 +05:30
Rushabh Mehta
da3f07221c
fix(dashboard): accounting timeline query fix
2019-04-08 19:38:55 +05:30
Rushabh Mehta
3882a41c51
fix(dashboard): simpler way to get account timeline from first principles
2019-04-08 19:05:12 +05:30
Rushabh Mehta
1412a681f3
Revert "fix: Raise exception if apps are on incompatible branches"
2019-04-08 17:10:56 +05:30
Rushabh Mehta
fbc56c6d97
fix(style): left padding in marketplace view
2019-04-08 17:02:22 +05:30
Mangesh-Khairnar
1934a76cd8
feat: Add status field in multiple reports linked with purchase order and sales order creation ( #17107 )
...
* enhancement: add status field in ordered itemd to be delivered
* enhancement: add status field in purchase order itemd to be received
* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
Saurabh
00a5e7a1d0
bumped to version 11.1.20
2019-04-08 15:39:03 +06:00
Nabin Hait
f1698bb2df
fix: unique variant based on
2019-04-08 14:59:43 +05:30
Nabin Hait
79c9d5d24a
Merge pull request #17146 from Anurag810/timesheet-report
...
feat: Timesheet report
2019-04-08 10:33:44 +05:30
Rohit Waghchaure
3771db92b8
fix: sales return not working for bundle items
2019-04-06 17:34:40 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
...
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17
Added test cases
2019-04-06 12:29:05 +05:30
Saurabh
63fabc3723
bumped to version 11.1.19
2019-04-05 17:29:22 +06:00
Nabin Hait
398e4b9472
fix: Ignore item tax patch if old schema does not exists
2019-04-05 16:41:17 +05:30
Nabin Hait
e6ee43b102
Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj
...
feat: add date of joining column in salary register
2019-04-05 16:02:48 +05:30
Nabin Hait
374b85b38e
Merge pull request #17140 from hrwX/pe_supp_inv_v12
...
fix(Payment Entry): Return Bill No on for Payment Entry
2019-04-05 15:59:58 +05:30
Nabin Hait
d70476fbc8
Merge pull request #17139 from hrwX/pe_supp_inv_v11
...
fix(Payment Entry): Return Bill No for Payment Entry
2019-04-05 15:59:43 +05:30
Nabin Hait
843e440191
Merge branch 'hotfix' into validate_stock_transaction_v11
2019-04-05 15:41:26 +05:30
Nabin Hait
9302a19d74
Merge pull request #17135 from hrwX/validate_stock_transaction_v12
...
fix(Item): check transactions for batch, serial check
2019-04-05 15:40:19 +05:30
Nabin Hait
1580e24946
Merge pull request #17137 from netchampfaris/item-group-clean-description
...
fix(Item Group): Don't clean description html
2019-04-05 15:39:44 +05:30
Nabin Hait
603dce428b
Merge pull request #17144 from nabinhait/variant-fix
...
fix: Default variant Based on
2019-04-05 15:38:15 +05:30
Anurag Mishra
0dc62e8747
fix: Removed raw query and used frappe.get_all
2019-04-05 14:36:43 +05:30
Anurag Mishra
f71c147ea8
Added mandatory feilds to the report
2019-04-05 14:36:43 +05:30
Anurag Mishra
5c17e7760b
fix: readability
2019-04-05 14:36:43 +05:30
Anurag Mishra
b57c024ff7
feat: Project Billing Summary for timesheet
2019-04-05 14:36:43 +05:30
Anurag Mishra
61aab377b6
Minor Fixes
2019-04-05 14:36:42 +05:30
Anurag Mishra
3d27aabdeb
Commonify code
2019-04-05 14:36:42 +05:30
Anurag Mishra
94514ffee9
feat: timesheet Employee Summary Report
2019-04-05 14:36:42 +05:30
Mangesh-Khairnar
3c251663bb
style: add type comparison for boolean expression
2019-04-05 14:10:05 +05:30
rohitwaghchaure
e334413b34
Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if
...
fix: incorrect auto POS profile selected in the sales invoice
2019-04-05 13:04:05 +05:30
Mangesh-Khairnar
e7d53540de
feat: add doj column in salary register
2019-04-05 12:56:11 +05:30
Mangesh-Khairnar
3d667b4c94
Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold
2019-04-05 12:11:26 +05:30
Nabin Hait
a3357e4e86
fix: Default variant Based on
2019-04-05 12:10:36 +05:30
John Clarke
b733984ca1
fix: Remove duplicate Timesheet item ( #17066 )
2019-04-05 11:02:25 +05:30
rohitwaghchaure
fc471ed63b
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
...
fix: incorrect POS profile selected
2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a
always set the company from the POS Profile
2019-04-05 09:58:04 +05:30
Rohit Waghchaure
e8e3fb175d
fix: incorrect POS profile selected
2019-04-05 09:57:52 +05:30
Rohit Waghchaure
4324f43a06
always set the company from the POS Profile
2019-04-05 09:54:55 +05:30
rohitwaghchaure
cbdd3304a4
Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos
...
fix: POS search items not works properly if item group filter has applied
2019-04-05 00:45:53 +05:30
Rohit Waghchaure
f7a83cb4f5
fix: incorrect POS profile selected
2019-04-05 00:42:48 +05:30
cjpit
0c87895afc
fix(node_modules): remove hardcoded symlink ( #16975 )
...
* add node_modules directory to gitignore
* remove node_modules symlink
2019-04-05 00:12:26 +05:30
Himanshu Warekar
b30f584410
fix: return bill_no
2019-04-04 19:55:13 +05:30
Himanshu Warekar
6443d7dd10
refactor: declare bill_on at function start
2019-04-04 19:54:23 +05:30
Himanshu Warekar
ad32324c4c
fix: get bill_no
2019-04-04 19:50:23 +05:30
Rohit Waghchaure
0a4aee0206
fix: POS search items not works properly if item group filter has applied
2019-04-04 16:02:15 +05:30
Faris Ansari
7a0a05d8f1
fix(Item Group): Don't clean description html
2019-04-04 15:53:16 +05:30
Himanshu Warekar
cdd79e3c40
fix: check transactions for batch, serial check
2019-04-04 15:26:35 +05:30
Rohit Waghchaure
55d3bcac37
fix: not able to change pos profile
2019-04-04 15:26:00 +05:30
Himanshu Warekar
7f253b679a
pull from hotfix
2019-04-04 15:19:44 +05:30
Himanshu Warekar
28db545947
fix: check transactions for batch, serial check
2019-04-04 15:02:25 +05:30
Nabin Hait
82bd388993
Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes
...
fix: Removed Location from Abbreviation Update DocTypes
2019-04-04 11:50:33 +05:30
Nabin Hait
9087efa5be
Merge pull request #17131 from Anurag810/desk-fixes
...
fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).
2019-04-04 11:49:56 +05:30
Nabin Hait
b861c4bc46
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override
...
fix(transaction): Fix shipping rule charge override by tax template
2019-04-04 11:48:48 +05:30
Nabin Hait
e0a9835f30
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix
...
fix(Party Ledger Summary): Show all adjustment entries as columns
2019-04-04 11:45:36 +05:30
Nabin Hait
0747273ea4
Merge pull request #17028 from sagarvora/field_order
...
fix(accounts): dependent field should be displayed after source link field
2019-04-04 11:45:01 +05:30
Nabin Hait
94c822f5f0
Merge pull request #17022 from hrwX/cost_center_fix
...
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:44 +05:30
Nabin Hait
9eeb3715f0
Merge pull request #16992 from hrwX/cost_center
...
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:35 +05:30
Nabin Hait
2df623c693
Merge pull request #17072 from kennethsequeira/auto-re-val
...
fix: spelling in validation message for Auto-reorder
2019-04-04 11:40:08 +05:30
Nabin Hait
1e5664ba5f
Update item.py
2019-04-04 11:39:55 +05:30
Nabin Hait
f4ae29320f
Merge pull request #17087 from deepeshgarg007/payment_entry
...
Party type validation in payment entry
2019-04-04 11:39:00 +05:30
Anurag Mishra
76795aa086
fix: desk for selling module sales invoice now avaialble at module page
2019-04-04 11:38:42 +05:30
Nabin Hait
f86a01446f
Merge pull request #17086 from adityahase/check-version-hf
...
fix: Raise exception if apps are on incompatible branches
2019-04-04 11:17:04 +05:30
Nabin Hait
9ee417888e
Merge pull request #17092 from nabinhait/ar-ap-print
...
fix: Show Sales Person in AR/AP print is optional
2019-04-04 11:02:26 +05:30
Nabin Hait
2c869bd486
Merge pull request #17101 from hrwX/india_setup
...
fix(India): Add HSN/SAC in setup
2019-04-04 11:02:11 +05:30
Himanshu Warekar
5ccc4731d0
fix: typo fix
2019-04-04 11:02:05 +05:30
Himanshu
c930cb10fa
fix: remove duplicate doctype
2019-04-04 11:01:10 +05:30
Nabin Hait
91b1875ccf
Merge pull request #17099 from nabinhait/return-precision-issue
...
fix: Validate returned qty with ref qty considering field precision
2019-04-04 10:59:26 +05:30
Nabin Hait
2092a8b1cf
Merge pull request #17100 from nabinhait/gl-entry-precision
...
fix: Validate gl entry debit/credit as per field's precision
2019-04-04 10:59:06 +05:30
Nabin Hait
6ffdddc100
Merge pull request #17126 from rmehta/warehouse-account-description
...
fix(kaizen): warehouse account description
2019-04-04 10:50:52 +05:30
Nabin Hait
fdf52a82d6
Merge pull request #17127 from rmehta/warehouse-account-fix-develop
...
fix(kaizen): warehouse account description
2019-04-04 10:50:42 +05:30
Nabin Hait
3149596b53
Merge pull request #17102 from hrwX/hsn_india_v12
...
fix(India): HSN Code
2019-04-04 10:49:55 +05:30
Nabin Hait
b652421a54
Merge pull request #17106 from nabinhait/loan-link
...
fix: Added link for loan in HR module page
2019-04-04 10:49:37 +05:30
Nabin Hait
d2c370a215
Merge pull request #17113 from deepeshgarg007/item-register
...
fix: Divide by zero exception handling
2019-04-04 10:49:13 +05:30
Rushabh Mehta
3720e64506
fix(kaizen): warehouse account description
2019-04-04 09:02:41 +05:30
Rushabh Mehta
1f0edabda8
fix(kaizen): warehouse account description
2019-04-04 08:58:34 +05:30
Rushabh Mehta
e7b6b46309
Merge pull request #17109 from PawanMeh/fixes_16894_v11
...
fix: Amazon v11 integration issues
2019-04-03 22:54:43 +05:30
asbasawaraj
d2b69445b1
Removed Location from Abbreviation Update DocTypes
2019-04-03 17:05:53 +05:30
rohitwaghchaure
fb48686d82
Merge pull request #17118 from rohitwaghchaure/_incorrect_prezzototale
...
fix: incorrect PrezzoTotale
2019-04-03 16:33:56 +05:30
Rohit Waghchaure
a2f71cdeec
fix: incorrect PrezzoTotale
2019-04-03 16:10:14 +05:30
Nabin Hait
b1f3f04d71
fix: Validate gl entry debit/credit as per field's precision
2019-04-03 12:30:25 +05:30
deepeshgarg007
5ad7b655cf
fix: Divide by zero exception handling
2019-04-03 09:11:03 +05:30
Mangesh-Khairnar
b2dc6ef165
style: fix the message for reason for hold
2019-04-02 18:01:14 +05:30
hello@openetech.com
ea00f8cbc3
[fix] #16894
2019-04-02 14:22:23 +05:30
Rushabh Mehta
43257c8cc3
fix(rename): Help Desk => Support
2019-04-02 08:59:15 +05:30
rohitwaghchaure
c0435f21c2
Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop
...
fix: incorrect calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 23:15:17 +05:30
rohitwaghchaure
b035bf7f39
Merge pull request #17095 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo
...
fix: incorrect calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 23:14:56 +05:30
Nabin Hait
9d431a8a83
fix: Added link for Expense Claim in HR module page
2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6
fix: Added link for loan in HR module page
2019-04-01 20:58:20 +05:30
Himanshu Warekar
656d8e4557
fix(India): HSN Code
2019-04-01 19:38:43 +05:30
Himanshu Warekar
624477cb21
fix(India): Add HSN/SAC in setup
2019-04-01 19:25:28 +05:30
Nabin Hait
b4263a41c6
fix: Validate gl entry debit/credit as per field's precision
2019-04-01 19:11:34 +05:30
Nabin Hait
88f036a171
fix: Validate returned qty with ref qty considering field precision
2019-04-01 18:41:31 +05:30
Rohit Waghchaure
58f489fec8
fix: calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 18:18:27 +05:30
Nabin Hait
0049986efd
Merge pull request #17088 from nabinhait/hsn-fixes
...
fix: Fetch HSN code only if empty
2019-04-01 18:17:26 +05:30
Deepesh Garg
6b320bea81
fix: GSTR3b test case fix ( #17094 )
2019-04-01 17:55:01 +05:30
Rohit Waghchaure
ebc2437516
fix: calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 17:50:31 +05:30
Rohit Waghchaure
6f3f2185ab
fix: pos takes more time to add an item in the cart
2019-04-01 16:45:47 +05:30
Nabin Hait
51d08786dc
fix: Show Sales Person in AR/AP print is optional
2019-04-01 16:24:23 +05:30
scmmishra
a409400e58
feat: added hero image field
2019-04-01 15:42:38 +05:30
scmmishra
d3bae4e8b5
feat: better cards in lms
2019-04-01 15:38:56 +05:30
rohitwaghchaure
f4d8457905
Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working
...
fix: POS qty decrement freezing the screen
2019-04-01 14:57:33 +05:30
Rohit Waghchaure
e994494e3e
fix: POS qty decrement freezing the screen
2019-04-01 14:29:55 +05:30
Nabin Hait
f4af608408
fix: Fetch HSN code only if empty
2019-04-01 11:51:54 +05:30
deepeshgarg007
4614eb219b
Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry
2019-04-01 11:48:07 +05:30
Aditya Hase
b841cb2a66
fix: Raise exception if apps are on incompatible branches
2019-04-01 11:36:57 +05:30
Nabin Hait
4873875c1c
Merge pull request #17038 from netchampfaris/fix-leave-application-condition
...
fix: Missing "and" in filter conditions
2019-04-01 11:15:36 +05:30
Nabin Hait
093f4c529b
Merge pull request #17055 from deepeshgarg007/tds
...
fix: TDS payable monthly report fix
2019-04-01 11:12:45 +05:30
Anurag Mishra
5402451b35
feat: Loan repayment report
...
Co-authored-by: crescent28 <mitali@erpnext.com>
2019-04-01 10:57:36 +05:30
Rohit Waghchaure
614f5adf6d
fix: code cleanup
2019-04-01 10:53:08 +05:30
Rohit Waghchaure
5fa9a7a1b4
feat: unlink advance payment entry on cancelation of order
2019-04-01 00:40:38 +05:30
Rohit Waghchaure
70b996af73
fix: test cases
2019-03-31 20:34:52 +05:30
scmmishra
751e75bb4c
chore: set lms as home page for lms user role
2019-03-31 18:31:53 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
deepeshgarg007
d0b98d74de
fix: Allow doctype only in party account types
2019-03-30 19:44:31 +05:30
Nabin Hait
f9f04ed89e
fix: woocommerce settings
2019-03-30 17:39:40 +05:30
Nabin Hait
da7a193f11
fix(stock): Fixed stock balance and stock ledger report
2019-03-30 15:53:04 +05:30
Kenneth Sequeira
4f5839eb65
fixed spelling in validation message
...
fixed typo in auto-reorder validation message
2019-03-30 15:37:51 +05:30
Saurabh
75b4de3e20
bumped to version 11.1.18
2019-03-30 15:30:36 +06:00
rohitwaghchaure
892f675cf7
Merge pull request #17069 from frappe/revert-16950-fix-issue-credit
...
feat: Revert "Fix(Delivery Note): Fix issue credit note"
2019-03-30 14:25:08 +05:30
rohitwaghchaure
223bd45e06
Merge pull request #17039 from surajshetty3416/fix-bom-item-subquery-issue
...
fix: Subquery in get_bom_items method
2019-03-30 14:23:25 +05:30
rohitwaghchaure
725f37cea5
Revert "fix(Delivery Note): Fix issue credit note"
2019-03-30 13:21:50 +05:30
rohitwaghchaure
f3a1fa0bae
Revert "Fix(Delivery Note): Fix issue credit note"
2019-03-30 12:33:54 +05:30
rohitwaghchaure
b6505bddeb
Merge pull request #17025 from hrwX/fix_issue_credit
...
fix(Delivery Note): Fix issue credit note
2019-03-30 12:31:29 +05:30
rohitwaghchaure
5fdbdd50f9
Merge pull request #16950 from hrwX/fix-issue-credit
...
Fix(Delivery Note): Fix issue credit note
2019-03-30 12:31:18 +05:30
Himanshu
52ae923566
fix(Update GSTIN): remove '.__' from template ( #17061 )
...
'.__' Avoid Server Side Template Injection
2019-03-30 12:11:27 +05:30
Himanshu
20c17b8229
fix(Update GSTIN): remove '.__' from template ( #17062 )
...
'.__' Avoid Server Side Template Injection
2019-03-30 12:11:01 +05:30
rohitwaghchaure
43d79eaa92
Merge pull request #17057 from hrwX/bank_reconciliation_fix
...
fix(Bank Reconciliation): get credit and debit as float and not string
2019-03-30 10:16:12 +05:30
rohitwaghchaure
9d159be826
Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account
...
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:14:19 +05:30
rohitwaghchaure
689a967443
Merge pull request #17065 from rohitwaghchaure/not_able_to_create_chart_of_account_develop
...
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:13:55 +05:30
Deepesh Garg
56e23e7d47
feat: GSTR1 json format download ( #16887 )
...
* feat: download gstr-1 b2b in json in its appropriate json format
* fix: download file as raw type
* feat: added logic to convert export gst data to its json
* code commonify and logic for b2cl added
* fix: Codacy and typo fixes
* fix: B2B json creation fixes
* fix: Filter customer by category
* fix: Fetch fp from to date
2019-03-29 22:22:54 +05:30
scmmishra
6f82f96816
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2019-03-29 20:05:40 +05:30
rohitwaghchaure
8dadd4b0b2
Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix
...
fix: cherry-pick item variant test cases fix
2019-03-29 19:32:30 +05:30
Rohit Waghchaure
cc59fcd75e
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-29 19:23:04 +05:30
Rohit Waghchaure
fd2b1385a3
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-29 19:20:47 +05:30
scmmishra
29dc744354
fix: healtcare unit type enable toggle
2019-03-29 19:00:45 +05:30
Himanshu
6343a697a2
fix(Salary Slip): Consider Leave without Pay for calculation ( #16926 )
...
while net salary calculation, it was not considering actual days worked but now it will consider it
2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status
...
fix: Task overdue status propagates to project
2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status
...
fix: task overdue status propagates to project
2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe
fix(Salary Slip): Consider Leave without Pay for calculation ( #17023 )
...
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
2019-03-29 18:32:23 +05:30
Rushabh Mehta
c4599c21c3
fix(test): item variant
2019-03-29 18:30:00 +05:30
Nabin Hait
92797eee87
Merge pull request #17052 from deepeshgarg007/patch-fix
...
fix: Add patch to move item tax to item tax template
2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0
Merge pull request #17045 from rmehta/fix-sla-auto-update
...
fix(sla): update agreement status on save'
2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca
fix: get credit and debit as float and not string
2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379
fix: get credit and debit in float and not string
2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e
fix: fetch account only if available
2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition
2019-03-29 16:06:38 +05:30
Rushabh Mehta
048e5f44b5
fix(test): item variant
2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716
Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12
...
fix: POS items not loading
2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13
Merge branch 'deferred_revenue' into hotfix
2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700
fix(accounts): Indentation
2019-03-29 13:25:11 +05:30
scmmishra
2b7e158e50
feat: Quiz attempt limits is configurable
...
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue
...
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30
deepeshgarg007
4f1926bcfe
fix: Add patch to move item tax to item tax template
2019-03-29 12:10:44 +05:30
scmmishra
d4ed56af02
fix: navbar login bug
2019-03-29 11:03:34 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue
...
fix: accounts receivable summary
2019-03-29 09:28:21 +05:30
Rohit Waghchaure
9da14747aa
fix: accounts receivable summary
2019-03-29 09:26:40 +05:30
Rohit Waghchaure
573d1dd31f
fix: bank reconciliation not working
2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7
fix(accounts): codacy fixes
2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6
Refactored deferred revenue booking logic
2019-03-28 19:43:02 +05:30
Rushabh Mehta
cf33f4fd53
fix(sla): update agreement status on save'
2019-03-28 18:49:23 +05:30
Rohit Waghchaure
d5e45481cd
fix: code cleanup
2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
...
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:51:57 +05:30
Faris Ansari
f04988a02f
fix: Missing "and" in filter conditions
2019-03-28 15:42:07 +05:30
scmmishra
cea851522f
feat: Added custom navbar
2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251
fix: styled program card
2019-03-28 15:32:54 +05:30
Suraj Shetty
6262c9ed6a
fix: Subquery in get_bom_items method
2019-03-28 14:59:27 +05:30
scmmishra
9b7ac3e7d2
fix: fixed joining date bug on lms profile
2019-03-28 14:47:22 +05:30
scmmishra
281902f530
chore: clean up
2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf
chore: Minor fixes on profile page
2019-03-28 14:34:23 +05:30
scmmishra
209250ccae
fix: Profile page cards
...
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2
fix: layout for hero image of program card
2019-03-28 14:15:30 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Saurabh
f2036dd1d1
bumped to version 11.1.17
2019-03-28 14:21:58 +06:00
scmmishra
29aaee1488
feat: Added youtube video component
2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7
feat: refactored YoutubePlayer component
2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b
fix: Video stops on closing modal
2019-03-28 13:11:00 +05:30
scmmishra
526af9d268
feat: added Youtube Video component
2019-03-28 13:10:42 +05:30
Saurabh
1271dea39b
Merge pull request #17035 from gaurav-naik/issue-17033
...
fix(regional,italy): autoset tax id, cf from customer before validating
2019-03-28 12:46:24 +05:30
rohitwaghchaure
89a2577ae5
Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview
...
fix(print): Fix group same items for print view
2019-03-28 12:42:22 +05:30
scmmishra
9bfe3a0315
feat: Added Program Intro Video modal
2019-03-28 12:20:24 +05:30
Gaurav
bd80fd13cb
fix(regional,italy): autoset company cf, tax_id before validating
2019-03-28 12:18:03 +05:30
Saurabh
ea19250884
Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml
...
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-28 11:19:44 +05:30
Faris Ansari
8fdcda7d6d
Merge pull request #16411 from adityahase/dashboard
...
feat: Accounting Dashboard
2019-03-28 11:16:41 +05:30
Gaurav
010acf75fa
fix(regional,italy): autoset tax id, cf from customer before validating missing values
...
Fixes issue #17033
2019-03-28 10:42:29 +05:30
Himanshu
4d45ca08de
fix(Issue): Time left and display only if Agreement exists ( #17014 )
...
* fix: time left and display only if agreement
* fix: remove div if present
* code refactor
* use frappe.scrub
* code formatting
Co-Authored-By: hrwX <himanshuwarekar@yahoo.com>
* remove unused fields
* remove unsed return value
2019-03-28 07:24:54 +05:30
Suraj Shetty
a7992ecb62
style: Fix formatting
2019-03-27 20:32:42 +05:30
Suraj Shetty
abc2a64d5e
fix: Commonify get gl_entry code by moving it to accounts_controller
2019-03-27 20:25:18 +05:30
scmmishra
233db67451
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-03-27 18:27:05 +05:30
scmmishra
f04ceaec95
chore: removed commented code
2019-03-27 18:14:59 +05:30
scmmishra
5b57d977d8
fix: single primary action on LMS home
2019-03-27 18:14:41 +05:30
scmmishra
3d39b88e7c
feat: LMS now supports multiple correct choice questions
2019-03-27 18:01:14 +05:30
Sagar Vora
d20ecb0a71
fix(accounts): dependent field should be displayed after source link field
2019-03-27 17:42:42 +05:30
Rohit Waghchaure
1b7059b867
fix: ImponibileImporto calculation
2019-03-27 15:33:47 +05:30
scmmishra
1b63c87929
feat: refactored update status
2019-03-27 15:04:55 +05:30
scmmishra
2405e14dde
Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status
2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb
feat: refactored update status
2019-03-27 15:01:40 +05:30
Himanshu Warekar
a86f3a7d80
remove issue credit note
2019-03-27 10:01:18 +05:30
rohitwaghchaure
fa638443bc
Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements
...
feat: stock entry enhancements
2019-03-26 22:50:54 +05:30
rohitwaghchaure
4510e3a836
Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making
...
fix: offline pos, duplicate records creating
2019-03-26 22:49:42 +05:30
Himanshu
e43b6beff0
fix(Leave Balance Report): total allocated leaves not calculated properly ( #16969 )
...
* fix: total alloted leaves not calculated properly
* fix: Possible SQL injection
* typo fix in sql query
* prevent sql injection again ?
* Use ORM for query
2019-03-26 21:42:12 +05:30
Himanshu Warekar
1b05ed042f
Cost Center as per company
2019-03-26 20:25:54 +05:30
Rohit Waghchaure
22ebaf1b11
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-26 20:19:46 +05:30
Rohit Waghchaure
1df62097f6
fix: offline pos, duplicate records creating
2019-03-26 19:15:53 +05:30
Prateeksha Singh
6d2bb9126a
Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom
...
fix(uom): Get items as per UOM defined in BOM
2019-03-26 18:00:50 +05:30
Nabin Hait
411f66a177
Merge pull request #17006 from deepeshgarg007/account-fix
...
fix: Ignore root company validation setting in company master
2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0
fix: Change name to Allow Account Creation against Child Company in company master
2019-03-26 17:18:06 +05:30
Prateeksha Singh
a0927c1ba6
fix: correct use of include_item_in_manufacturing
2019-03-26 16:55:13 +05:30
Nabin Hait
8aaee57921
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-26 16:53:13 +05:30
Anurag Mishra
10c1db1b28
fix: removed empty row on getting invoices
2019-03-26 16:30:31 +05:30
rohitwaghchaure
e196b3120e
Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise
...
feat: Stock ageing report warehouse wise
2019-03-26 16:21:17 +05:30
Anurag Mishra
ca4117e652
feat: seting status and indicators on list view
2019-03-26 16:03:00 +05:30
Anurag Mishra
702c6e00da
fix: route on loan Disbursement and Closing
2019-03-26 16:00:43 +05:30
deepeshgarg007
c45c2bdabb
fix: Missing semicolon
2019-03-26 15:38:38 +05:30
deepeshgarg007
7aefc15352
fix: Allow to add child account if ignore validation checked
2019-03-26 15:09:29 +05:30
Anurag Mishra
78903b1e57
fix: test for invoice payment by setting default Bank Account
2019-03-26 12:59:30 +05:30
Rohit Waghchaure
5816fc2801
Renamed subcontract to Send to Subcontractor
2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428
renamed purpose in stock entry
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433
feat: added button get items from material request in stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706
Added test cases
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087
feat: added good in transit feature in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360
feat: added stock entry type master to select purpose in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
327c194144
Added hsn code field in the stock entry item table
2019-03-26 12:52:08 +05:30
Raffael Meyer
fdbb516a1b
fix(projects): Auto-set employee and company in Timesheet ( #16743 )
...
* fix(projects): auto-set employee and company
* only set employee and company if document is unsaved
* use frm.set_value()
2019-03-26 12:47:36 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
deepeshgarg007
1c785a99b1
fix: Added setting in company to ignore root company validation
2019-03-25 22:32:29 +05:30
Mangesh-Khairnar
324e06cba0
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-03-25 18:51:13 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
rohitwaghchaure
7779bb3839
Merge pull request #17010 from rohitwaghchaure/rename_pricing_rule_child_doctypes
...
fix: rename pricing rule child doctype names
2019-03-25 17:50:02 +05:30
Mangesh-Khairnar
b3ec508655
feat: record reason for hold as comment
2019-03-25 17:29:14 +05:30
Mangesh-Khairnar
5e474f4664
fix: add server-side validation for closed sales order for linked material request
2019-03-25 17:28:20 +05:30
Mangesh-Khairnar
c423d6f2e4
fix: validate sales order linked work order creation on server side
2019-03-25 17:27:33 +05:30
Mangesh-Khairnar
bcb8b135f2
feat: ask reason for putting sales order on hold
2019-03-25 17:27:16 +05:30
Faris Ansari
843b7f6dd5
fix: Reorder Currency column to fix print ( #17008 )
...
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
Rohit Waghchaure
4ed7d035cb
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:37:25 +05:30
Rohit Waghchaure
4792a84b5f
fix: rename pricing rule child doctype names
2019-03-25 14:28:08 +05:30
rohitwaghchaure
794b6b6c0d
Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix
...
fix: Show consolidated amount of payment entries in Bank reconciliation
2019-03-25 14:11:47 +05:30
Rushabh Mehta
5770ad9e8c
Merge pull request #16963 from itusedyetnew/develop
...
Fix:stock_values_on removed append function on string
2019-03-25 12:03:53 +05:30
Rushabh Mehta
689490e4de
Merge pull request #16986 from hrwX/italy_xml_fix
...
fix(Italy Customisation): Include fiscal code in invoice xml if present
2019-03-25 11:57:30 +05:30
deepeshgarg007
4f9ac0ad55
fix: Child company account currency fix
2019-03-25 11:39:25 +05:30
Shivam Mishra
ec56122876
fix: minor fix in test
2019-03-25 11:36:43 +05:30
scmmishra
26e5c753db
fix: Typo in update_status
2019-03-25 11:35:28 +05:30
scmmishra
1af3c41da3
fix: Typo in update_status
2019-03-25 11:34:33 +05:30
Suraj Shetty
67876d1026
fix: Show amount of entry based on diff of credit and debit
2019-03-25 11:19:07 +05:30
scmmishra
f7f32634c8
feat: Added check for no end date and refactored query
2019-03-24 20:43:15 +05:30
scmmishra
a2e801e840
fix: Added check for no end date
2019-03-24 20:38:47 +05:30
scmmishra
5869ba1470
feat: Added filter to query
2019-03-24 20:27:32 +05:30
scmmishra
e7cf06b3c6
fix: task overdue status propagates to project
2019-03-24 18:23:41 +05:30
scmmishra
6ab6d35f92
fix: Task Overdue status propagates to project
...
- Used ORM instead of a SQL for set_task_as_overdue
- update_status function compares the time and marks the appropriate task as overdue
- The on_update hook makes the changes in project as well
2019-03-24 18:17:13 +05:30
rohitwaghchaure
6fabcdd5b3
Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports
...
feat: sales partner reports
2019-03-24 14:52:45 +05:30
rohitwaghchaure
9673d0ddae
fix: description missing in the XML ( #16985 )
2019-03-24 12:19:58 +05:30
Himanshu Warekar
92593bb717
fix: Cost center as per company
2019-03-23 19:46:31 +05:30
Frappe Bot
b07a5d449d
Merge branch 'master' into develop
2019-03-23 07:25:03 +00:00
Frappe Bot
021ccf572a
bumped to version 11.1.16
2019-03-23 07:25:02 +00:00
Zarrar
963d62b701
feat: Chart of Accounts Importer ( #16623 )
...
* bare doctype created for COA utility
* improvise doctype's design
* validation to check no transaction exist for the company
* download file and import coa - client side logic added
* download csv template to create custom chart
* read the custom csv uploaded and parse it to appropriate format
* convert list of list to nested tree structure
* preview the uploaded chart before actual import
* toggle field based on necessity
* tweak create_charts and build_json logic to incorporate COA Import utility
* code cleanify and validation call added
* code enhancement for flexibility and validation added
* show import button only if data is validated
* unset existing data and load new accounts
* disable coa fields if parent_company set, minor improv
* file api fix
* added progress bar
* codacy fixes
* fix: Add account number in template
* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Himanshu
138e030055
CodiceFiscale should be after IdFiscaleIVA
2019-03-22 23:22:52 +05:30
Saif Ur Rehman
7d1c1aa28f
fix(Party Ledger Summary): Show all adjustment entries as columns
...
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
2019-03-22 17:18:32 +05:00
Himanshu Warekar
1d04ea1212
fix: include fiscal code in invoice xml if present
2019-03-22 17:47:57 +05:30
rohitwaghchaure
56e491bccd
Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields
...
feat: enabled allow on submit for action fields in the Budget
2019-03-22 15:34:41 +05:30
Prateeksha Singh
cc1a022d63
fix: correct use of include_item_in_manufacturing
2019-03-22 14:58:22 +05:30
Rushabh Mehta
d562e9530e
fix(link): help link in selling
2019-03-22 14:46:12 +05:30
Rushabh Mehta
c0de5b741e
fix: remove gitter chat
2019-03-22 14:32:00 +05:30
Nabin Hait
95705412f3
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-22 13:19:17 +05:30
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix
...
fix: Rounding adjustment in Rounded Total
2019-03-22 12:51:09 +05:30
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name
2019-03-22 12:48:56 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt
...
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12
...
feat: Brand Item Defaults (v12)
2019-03-22 12:46:04 +05:30
Rushabh Mehta
ff04142d9b
Merge pull request #16848 from alyf-de/hotfix-1
...
fix(projects): change fieldtype of billing amounts to Currency
2019-03-22 12:44:18 +05:30
Rushabh Mehta
7defd6f3b5
Merge pull request #16749 from Alchez/hotfix-cancelled-payments
...
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
2019-03-22 12:43:52 +05:30
Rushabh Mehta
b0a7cbb591
Merge pull request #16905 from frappe/netchampfaris-patch-1
...
fix: Update Training Level
2019-03-22 12:43:00 +05:30
Rushabh Mehta
199aae0fe8
Merge pull request #16861 from Anurag810/asset_fixes
...
fix: passing the correct argument in get_depreciation_amount
2019-03-22 12:42:46 +05:30
Rushabh Mehta
fc4eefcb22
Merge pull request #16871 from rmehta/attendance-from-leave
...
feat: Pre mark attendance for Leave Application
2019-03-22 12:41:47 +05:30
Rohit Waghchaure
9c214b6129
feat: enabled allow on submit for action fields in the Budget
2019-03-22 12:08:09 +05:30
Rushabh Mehta
2f9c7171fa
Merge pull request #16980 from chdecultot/fec_correctioon
...
fix: [Regional] [FEC report] Mapping issue in sql query
2019-03-22 12:05:51 +05:30
Deepesh Garg
22b61607c6
feat: GSTR3B Report JSON creation and Print Format ( #16595 )
...
* feat: Created doctype for GSTR3B report and added boilerplate code
* feat: Updated gst_fields and patches for gst_category
* feat: Functions for calculating itc amount
* fix: Patched eligibility_for_itc_field
* fix: Updated set_category for gst
* fix: Function for setting iter_state supplies
* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format
* fix(style): Added missing semicolon and removed unused imports
* fix: Patch field only if column is available
* fix: Make custom fields only for india sepecific company
* fix: Add intro to gstr3b report
* fix: Updated patch in patches.txt
* fix: Update patches.txt
* fix: Update patch to set GST Category
* fix: Add fields for nil rated and non gst in item master
* fix: Added logic for nil rated and non gst inward flow
* fix: Initial test case for GSTR3B Report
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Add link for gstr_3b_report in accounting module
* fix: Updated report template
* fix: Changes in GSTR3B Report doctype
* fix: Added function to get missing field invoices
* fix: Added more test cases
* fix: Item not found error in test case
* fix: Key error in state numbers
* fix: Changes in GSTR3b Doctype
* fix: Changed functions to method
* fix: Minor fix in patch
* fix: Add gst_ctegory in GST Reports
* fix: Minor fixes in patch and itc_mapping
* fix: Query to patch itc field
* fix: Patch registered customers and fix for multiple gst accounts
* fix: Test case
* fix: Total taxable calculation logic fix and template enhancement
* fix: Calculate txval seperately
* fix: itc amount calculation fix and patch improvement
* fix: Updated test_cases for itc calculation
* fix: Missing field query
* fix: Multiple minor fixes inreport
* fix: Added transalations in GSTR3B-Form
* fix: Use double underscore for translation
* fix: GST fields ordering fix
* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30
Charles-Henri Decultot
a7cf7fbccc
Fix: Mapping issue in sql query
2019-03-21 13:28:14 +00:00
Deepesh Garg
3a05b3501c
fix: Failing test case on develop ( #16974 )
2019-03-21 12:53:12 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Saurabh
83cc587f8f
bumped to version 11.1.15
2019-03-20 15:03:00 +06:00
Faris Ansari
3ba91d7e19
fix: Add /all-products to sitemap
2019-03-20 14:11:22 +05:30
Faris Ansari
d77fe38513
fix: Remove no_sitemap property
2019-03-20 14:11:05 +05:30
rohitwaghchaure
f45db71ba2
Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working
...
fix: Cost center from PO to PI is not mapping
2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130
fix: Cost center from PO to PI is not mapping
2019-03-20 13:34:28 +05:30
Mangesh-Khairnar
2ffa87ea34
feat: added erpnext doctype via hooks ( #16930 )
2019-03-20 13:25:48 +05:30
scmmishra
43e9375642
feat [WIP]: Added multiple choice question component
2019-03-20 13:25:02 +05:30
Rohit Waghchaure
65d9435fd5
feat: sales partner reports
2019-03-20 12:05:21 +05:30
itusedyetnew
8aafbd22de
stock_values_on append function on string
2019-03-20 11:10:41 +05:30
Rohit Waghchaure
ca9f93cdc2
feat: Stock ageing warehouse wise
2019-03-20 02:14:54 +05:30
rohitwaghchaure
e521f51e5f
Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars
...
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:17:15 +05:30
Mangesh-Khairnar
7fc1bc0b27
fix: handle an empty match query condition in leave application ( #16931 )
2019-03-19 18:14:02 +05:30
Rohit Waghchaure
a322687897
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:10:08 +05:30
Himanshu
f3e5213190
feat(Support): Service Level Agreements ( #16828 )
...
* init SLA
* Added more inputs to the forms
* set priority of issue
* Removed UOM in favor of hours for tracking
* updated js to autofill values
* Removed unwanted fields
* timer functionality
* code refactor
* parenthesis fix
* fixed typo
* added new fields
* Updated fields
* Updated fields for issue doctype
* Updated fields for issue doctype
* changed doctype structure
* added new fields to issue
* code refactor
* new function to set criticality level
* changed dropdown options
* set timer for sla
* calculation of resolution and response time
* stopwatch counter
* dashboard changes
* renamed sla to support contract
* countdown timer section
* issue doctype changes
* removed unwanted imports
* fixed wrong response time and resolution time
* update response and resolution time
* calculate time to respond and resolve
* feature enhancements
* probable scheduling bug fix
* fixed scheduling issue support sent out of support time
* removed issue criticality link from support
* Changed day order
* skip date validation when support contract is default
* removed mandatory field
* fix scheduling conditions for now
* code refactor
* removed duplicate doctypes
* fixed day inserted twice in service level
* check to not add another default contract
* default support contracts
* removed commented code
* removed unused imports
* fix sla for non-listed days
* reduced redundant code and optimized it and starting unit tests
* added condition check to compute days correctly
* renamed doc as per guidelines and added conditions for scheduling
* removed per day support timings
* added response and resolution time to support contract
* scheduling based on hours kinda fix
* set sla before_update and finally fixed time scheduling out of support time
* DocType Issue removed test_records and rewrote test cases
* test cases and codacy fixes
* Doctype SLA instead of Support Contract to avoid confusion with Contract
* fixed tests failing due to change in options for time period
* change naming to Prompt
* remove unknown doctype from help_desk
* revert unwanted changes to default
* refactor get_list for fetching service_level_agreement
* change datatypes
* fix tests
* refactored tests
* remove unused imports
* code and comments refactor for better understandability
* removed and renamed doctype to service days and minor fixes
* Refactor test cases for response and resolution time for issue
* add validation to check if response time < resolution time
* minor fix for checking if current day is start day
* calculate time in js rather than python
* fix: parenthesis fixing customer dashboard
* json changes to rename sections
* refactor: alignment
* refactor: beautify code
* fix: use frm api to get the element
* fix: replace '__' with '_'
* refactor: remove pointless test
2019-03-19 16:47:56 +05:30
rohitwaghchaure
40046721b2
Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors
...
fix: POS, cost center not added against debtors
2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e
fix: POS, cost center not added against debtors
2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
...
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a
fix: advance amount is not calculating properly
2019-03-19 15:06:01 +05:30
Rohit Waghchaure
8bfe330b37
feat: pricing rule enhancements
2019-03-19 12:44:30 +05:30
scmmishra
000e706337
feat: Only student progress is recorded in LMS
...
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 ( #15965 )
...
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Himanshu Warekar
642a5b69f5
fix: change customer to supplier
2019-03-18 21:53:33 +05:30
Himanshu Warekar
2f5f17fcbb
refactor: fix issue credit note
2019-03-18 21:46:26 +05:30
scmmishra
7ad5619318
feat: Set default role to LMS User for signup in Education
2019-03-18 19:11:44 +05:30
scmmishra
eaed1ae3d6
fix: Added import statement for translate wrapper
2019-03-18 19:11:07 +05:30
scmmishra
f2c638f8ab
fix (minor): Replaced text editor with small text in course doctype
2019-03-18 18:38:51 +05:30
scmmishra
acc278de9c
feat: Added validations for question doctype
...
- A question must have more than two options
- A question must have at least one correct option
2019-03-18 18:38:18 +05:30
scmmishra
5c646e60f5
fix: Auto course enrollment for enrolled programs in LMS
2019-03-18 18:37:35 +05:30
scmmishra
a0978a2aab
chore: Cleaned up quiz.py
2019-03-18 18:37:06 +05:30
Rushabh Mehta
f060831cce
fix(escaping): make_italian_localization_fields.py
2019-03-18 18:04:34 +05:30
Rohit Waghchaure
5b43e2f31a
code cleanup
2019-03-18 17:00:44 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool
...
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
2019-03-18 15:48:55 +05:30
scmmishra
e3dea29f58
fix: Minor UI fix
2019-03-18 15:44:55 +05:30
Himanshu
ac199580af
fix(Customer Ledger): ambiguous error in where clause ( #16914 )
...
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
2019-03-18 15:44:54 +05:30
scmmishra
621cad8781
fix: Default program list
...
Shows two latest programs if no program is set as featured
2019-03-18 15:40:47 +05:30
scmmishra
c22eef28f7
fix: LMS Title
...
Shows default company name if LMS title not set
2019-03-18 15:36:49 +05:30
scmmishra
dcbe7e5490
fix: Added permissions for instructor
...
Also made description mandatory in program
2019-03-18 15:29:30 +05:30
scmmishra
b2c745827f
fix: Removed accidentally added course doctype in list
2019-03-18 15:28:49 +05:30
rohitwaghchaure
ac9f38bfc2
Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap
...
feat: added cost center filter in AR/AP reports
2019-03-18 14:22:15 +05:30
Rohit Waghchaure
d4e4316d0b
fix: test cases and codacy
2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c
codacy fixes
2019-03-18 12:50:29 +05:30
Zlash65
11bba571af
test case added to check account syncing
2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62
fix: chart of accounts field toggling improv
2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d
fix: return if no descendants found
2019-03-18 12:50:28 +05:30
Zlash65
73acb8c837
fix: set chart of accounts based on parent company on server side
2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e
feat: sync account created for a group company to all its descendants
2019-03-18 12:50:28 +05:30
Zlash65
88c990901d
fix: added validation to if account is being added to child company
2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00
fix: override primary action button, change filter to root company
2019-03-18 12:50:27 +05:30
Zlash65
2def228da8
feat: allow adding account only if topmost parent company
...
- hidden filter for Parent Company added
- Add button overriden with new condition
2019-03-18 12:50:27 +05:30
Zlash65
a57d58f756
feat: once company is saved, parent_company cannot be selected
2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090
feat: selecting parent_company should disable chart_of_accounts based fields
2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56
disbale pl check for Sales and Purchase Invoice
2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Mangesh-Khairnar
db96db2897
style: change position of hold and resume button
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
e613c4f380
test: purchase order on hold
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
873c579bb4
fix: check for both hold and closed status in po
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
4f74313baf
feat: record reason for hold as comment
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723
feat: add validation for on hold purchase order
2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
439546c83c
feat: add on hold status in purchase order
2019-03-18 12:14:25 +05:30
scmmishra
b854d64401
Merge branch 'develop' of github.com:frappe/erpnext into lms-beta-v2
2019-03-18 11:51:27 +05:30
Aditya Hase
42640cb908
fix(dashboard): Add configuration to chart source
2019-03-18 11:18:43 +05:30
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 ( #16847 )
2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix ( #16935 )
2019-03-17 09:49:24 +05:30
Mangesh-Khairnar
b343407236
refactor: change validate email add to validate email address
2019-03-16 13:40:58 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit
...
feat: added provision to disable CWIP accounting in asset settings
2019-03-16 12:18:36 +05:30
rushin29
08a209bc52
fix: gst_state_number for address with Unregistered GST ( #16798 )
2019-03-15 15:28:50 +05:30
rohitwaghchaure
ef74e94374
Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card
...
feat: child table to add multiple time logs in job card
2019-03-15 11:46:33 +05:30
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template
...
fix: Add credit month in validation
2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop
...
fix: Add 'Half-Yearly' option to Earned Leave Frequency
2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance
...
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
2019-03-15 09:02:20 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py
2019-03-15 08:57:49 +05:30
Rushabh Mehta
e5d79f3621
Merge pull request #16673 from Alchez/feat-task-from-issue
...
feat(issue): Create and view Tasks from Issues
2019-03-15 08:55:20 +05:30
Anurag Mishra
ed190bb329
fix: codacy
2019-03-14 18:14:20 +05:30
Anurag Mishra
1c7baaeba5
test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices
2019-03-14 16:45:02 +05:30
Anurag Mishra
6deffbd6e8
test: loan_return date and loan Sanctioned on submit
2019-03-14 16:44:49 +05:30
Anurag Mishra
4a538ba78a
Resolve merge conflict
2019-03-14 16:43:16 +05:30
Nabin Hait
ed96591618
feat(accounts): Invoice Discounting
2019-03-14 16:42:44 +05:30
scmmishra
0bcae95d3c
chore: Fixed config for education
2019-03-14 15:46:51 +05:30
scmmishra
21823f5f66
feat: Added test for program_enrollment
2019-03-14 15:44:01 +05:30
scmmishra
e3b7e1381d
feat: Moved make_course_activity to test_course_activity.py
2019-03-14 15:34:13 +05:30
scmmishra
8aa6ac7b03
feat: Moved setup_program to test_program.py
2019-03-14 15:32:22 +05:30
scmmishra
a98e936d26
chore: Removed LMS Activity Doctype
2019-03-14 15:24:26 +05:30
scmmishra
88b2244468
feat: Added test for course_enrollment
2019-03-14 15:19:20 +05:30
scmmishra
c75b513e2c
fix: Enrollment bug
2019-03-14 15:16:14 +05:30
scmmishra
34fa33d324
fix: Config bug, added type doctype
2019-03-14 15:14:25 +05:30
Bassam Ramadan
e14758c897
fix: add returns field to cashier closing ( #16911 )
2019-03-14 15:01:50 +05:30
Rushabh Mehta
947d573276
Merge pull request #16892 from hrwX/uae_fix
...
fix(UAE): Fetch from fix for UAE customizations
2019-03-14 14:20:32 +05:30
Rushabh Mehta
e8258fc352
Merge pull request #16854 from jay-parikh/hotfix
...
fix: Default Company to Total Stock Summary Report
2019-03-14 14:18:36 +05:30
Rushabh Mehta
2352ce92cc
Merge pull request #16849 from frappe/bcornwellmott-patch-1
...
fix: Add date to currency exchange caching
2019-03-14 14:18:09 +05:30
Rushabh Mehta
d63e0f490c
Merge pull request #16856 from hrwX/sales-work-fix
...
fix(Work Order): fetch item info when making work order from sales order
2019-03-14 14:17:40 +05:30
Rushabh Mehta
20af5a2b40
Merge pull request #16866 from deepeshgarg007/additional
...
fix: Removed relieving date validation form additional salary
2019-03-14 14:16:18 +05:30
Rushabh Mehta
bd9622bfd5
Merge pull request #16918 from Alchez/hotfix-party-payments
...
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 14:14:42 +05:30
Rohan Bansal
82433845e5
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 13:18:55 +05:30
scmmishra
14d70ce444
chore: updated education config
2019-03-14 12:31:25 +05:30
Rushabh Mehta
f49d0d8058
Merge pull request #16890 from Anurag810/timesheet
...
feat: Timesheet Reports
2019-03-14 10:31:23 +05:30
Rushabh Mehta
6e2286f5f0
Merge pull request #16897 from PawanMeh/fixes_16894
...
fixes: Amazon v12 integration issues
2019-03-14 10:30:29 +05:30
Aditya Hase
3b75551739
feat(dashboard): Render Account Balance Timeline is a time series
2019-03-12 14:47:21 +05:30
Aditya Hase
59fc039c77
style: Linting fixes
2019-03-12 14:47:21 +05:30
Aditya Hase
1e0f9a2882
feat(dashboard): Use caching decorator for dashboard
2019-03-12 14:47:21 +05:30
Aditya Hase
76158e6643
feat(dashboard): Export chart source doc to JSON file
2019-03-12 14:47:21 +05:30
Aditya Hase
675c1d3a5a
refactor(dashboard): Move Soure settings to account_balance_timeline.js
2019-03-12 14:47:20 +05:30
Aditya Hase
09f2ed2e69
refactor(dashboard): Move dashboard.py to account_balance_timeline.py
2019-03-12 14:47:20 +05:30
Aditya Hase
d85b0ae602
fix(dashboard): Remove unused variables
2019-03-12 14:47:20 +05:30
Aditya Hase
2fa1d9caed
fix(dashboard): Remove print statement
2019-03-12 14:47:20 +05:30
Aditya Hase
15c0cfff0f
refactor(dashboard): Convert indentation to tabs
2019-03-12 14:47:20 +05:30
Aditya Hase
4b171ddebb
feat(dashboard): Remove hardcoded company filter
2019-03-12 14:47:20 +05:30
Aditya Hase
3b593e44c6
feat(dashboard): Set account from filters
2019-03-12 14:47:20 +05:30
Aditya Hase
5911e100ad
fix(dashboard): Consider opening balance
2019-03-12 14:47:20 +05:30
Aditya Hase
6cadf77073
feat(dashboard): Add Time Grain filter
2019-03-12 14:47:20 +05:30
Aditya Hase
c888e52788
feat(dashboard): Add missing dates
2019-03-12 14:47:20 +05:30
Aditya Hase
8896374413
feat(dashboard): Add timespan filter
2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47
feat(dashboard): Create Accounting dashboard from General Ledger Report
2019-03-12 14:47:20 +05:30
Anurag Mishra
641e412853
fix: Removed raw query and used frappe.get_all
2019-03-12 13:12:31 +05:30
Rohan Bansal
f4bce6a66e
fix(issue): Replace Make buttons on Issue and Task with a dashboard
2019-03-12 12:48:13 +05:30
Rohan Bansal
bf7c69f3c4
fix(issue): Don't auto-set project
2019-03-12 12:48:13 +05:30
Rohan Bansal
fa77b591ac
fix(issue): View Tasks against an Issue
2019-03-12 12:48:13 +05:30
Rohan Bansal
2ba21fb66c
fix(issue): Add issue name in Task and fix description in Issue
2019-03-12 12:48:13 +05:30
Rohan Bansal
5327d0253d
feat(issue): Create tasks from issues
2019-03-12 12:40:32 +05:30
Rohan Bansal
6cbd3998fb
fix(work_order): Use single update query
2019-03-12 12:15:37 +05:30
Rohan Bansal
b4745ec668
fix(work_order): Change Work Order title to show item name instead of item code
2019-03-12 12:13:02 +05:30
Anurag Mishra
9a1adc7c49
Added mandatory feilds to the report
2019-03-12 11:00:02 +05:30
Faris Ansari
47f1080f1e
fix: Update modified
2019-03-12 10:57:35 +05:30
Faris Ansari
175709ed50
fix: Update Training Level
...
- Rename Expert to Intermediate, since it was ambiguous with Advance
2019-03-12 10:55:39 +05:30
Faris Ansari
2221151132
fix: Update Training Level
2019-03-12 10:55:11 +05:30
Anurag Mishra
34e1f92a7e
fix: readability
2019-03-11 18:17:22 +05:30
Anurag Mishra
1218255178
feat: Project Billing Summary for timesheet
2019-03-11 17:43:44 +05:30
Rohan Bansal
90972cfbf9
fix(transaction): Avoid shipping rule charge override by tax template
2019-03-11 15:00:48 +05:30
pawan
c0e1000919
fix: SKU issue
2019-03-11 14:58:17 +05:30
pawan
7c3e017ac3
fix: Amazon integration issues
2019-03-11 14:47:57 +05:30
Rohit Waghchaure
267723f57b
fix: stock ledgre report not working
2019-03-11 14:06:00 +05:30
Anurag Mishra
9b64baa734
Minor Fixes
2019-03-11 12:02:25 +05:30
Anurag Mishra
59f4556d95
Commonify code
2019-03-11 11:58:34 +05:30
Anurag Mishra
e86ac3c8d4
feat: timesheet Employee Summary Report
2019-03-11 11:58:28 +05:30
Rohit Waghchaure
52729bf369
feat: child table to add multiple time logs in job card
2019-03-11 00:02:32 +05:30
Himanshu Warekar
1692fbaf1c
fetch from fix
2019-03-08 18:37:34 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Frappe Bot
3406229152
bumped to version 11.1.14
2019-03-08 09:39:32 +00:00
Rushabh Mehta
96842c9de6
fix(typo): leave_application.py
2019-03-08 12:36:43 +05:30
Rushabh Mehta
701c0b792c
feat: Pre mark attendance for Leave Application
2019-03-08 12:30:42 +05:30
Rohit Waghchaure
6b33c9b934
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125
feat: added provision to disable CWIP accounting in asset settings
2019-03-08 10:51:37 +05:30
Nabin Hait
9ec4816b32
Update item_barcode_childtable_migrate.py
2019-03-08 10:44:13 +05:30
Saif Ur Rehman
e62bd893c5
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
deepeshgarg007
78a32ae172
fix: Remove validation for relieving date from additional salary
2019-03-07 20:00:07 +05:30
Anurag Mishra
1b0f5fd430
fix: pass correct argument to method get_deprication_amount
2019-03-07 16:17:00 +05:30
Rushabh Mehta
703a597478
fix(patch): update customization options if completed is not present
2019-03-07 13:03:40 +05:30
Rushabh Mehta
e9db0d2c61
fix(minor): update task list label from Closed to Completed
2019-03-07 12:50:02 +05:30
rohitwaghchaure
d4754619d0
Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table
...
fix: scan barcode not adding the barcode value in the items table
2019-03-07 11:29:56 +05:30
Himanshu Warekar
7ab961f798
remove debug code
2019-03-06 23:53:38 +05:30
Himanshu Warekar
59699bf46e
[debug] locally tests passed but travis failed
2019-03-06 23:33:03 +05:30
Himanshu Warekar
4f1737c2dd
fix sales order test for creating work order from sales order
2019-03-06 22:19:15 +05:30
scmmishra
62416224ab
feat: Added test utilities for course_activity
2019-03-06 19:01:28 +05:30
Himanshu Warekar
783331c645
sales_order to work_order item desc fix
2019-03-06 18:44:04 +05:30
Rohit Waghchaure
db8500c03a
POS profile, account for change amount must be cash or bank account
2019-03-06 18:28:45 +05:30
Jay Parikh
9757a603fa
Fix Company Default to Total Stock Summary Report
2019-03-06 12:44:41 +00:00
scmmishra
18ddc92947
feat: Added check for duplicate course enrollment
2019-03-06 17:05:17 +05:30
scmmishra
890ce60e86
style: Removed trailing spaces
2019-03-06 17:04:42 +05:30
scmmishra
531d2761cf
feat: Refactored some enrollment functions
2019-03-06 17:04:17 +05:30
scmmishra
b72ba416ff
feat: More tests
2019-03-06 17:03:51 +05:30
Rohan Bansal
e66f59654e
fix(report): Incorrectdata for balance quantity and value in Stock Balance report
2019-03-06 16:04:11 +05:30
scmmishra
bf9a10fd5e
chore(style): Renamed a function
2019-03-06 15:45:35 +05:30
scmmishra
bcfe6f024f
feat: Added lms tests for student doctype
2019-03-06 15:26:41 +05:30
scmmishra
92ab107b60
fix: Minor fix
2019-03-06 15:26:20 +05:30
scmmishra
4a7e2c1e2f
feat: Minor changes to topic tests
2019-03-06 15:19:02 +05:30
scmmishra
2cec025bbe
feat: Added test for program doctype
2019-03-06 15:18:43 +05:30
scmmishra
64347a5642
feat: Added test for Course Doctype
2019-03-06 15:18:27 +05:30
scmmishra
75defde940
fix: fixed user creation bug in student
2019-03-06 15:18:01 +05:30
Rushabh Mehta
29c46bb311
fix(sales_order.py): handle zero bundle qty
2019-03-06 14:49:13 +05:30
Joyce Babu
3d0121369f
Add 'Half-Yearly' option to Earned Leave Frequency
...
in addition to the current values of Monthly, Quarterly and Yearly
2019-03-06 13:04:45 +05:30
scmmishra
18a1a8d4f4
style: Fixed route.js
2019-03-06 10:55:21 +05:30
bcornwellmott
b263876918
Add date to currency exchange caching
...
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
2019-03-05 16:44:02 -08:00
Raffael Meyer
33d0a9f684
fix(projects): change fieldtype of billing amounts to Currency
2019-03-05 21:57:11 +01:00
Himanshu Warekar
250ebe5888
Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop
2019-03-05 17:45:14 +05:30
Himanshu Warekar
219b9f4150
Salary Component can be equal to zero
2019-03-05 17:44:07 +05:30
deepeshgarg007
e062acbbd3
fix: Removed shortcuts from desktop.py
2019-03-05 17:17:10 +05:30
Himanshu Warekar
acb7238ad6
Allow zero amount in additional salary
2019-03-05 12:20:19 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return
...
fix: Python 3 Sales Invoice Return Validation "validate_pos"
2019-03-05 08:05:00 +05:30
rohitwaghchaure
55c382a780
Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes
...
fix: on save of the address, state code field become blank
2019-03-04 16:59:45 +05:30
rohitwaghchaure
f6a8b17717
Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description
...
fix(sales order item): not able to search item by description
2019-03-04 16:59:19 +05:30
rohitwaghchaure
369d20ac2b
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number
...
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats
...
feat: Auditors print formats
2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
...
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf
Minor fixes
2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc
fix: gross depends upon now report type
2019-03-04 14:46:28 +05:30
Prateeksha Singh
a5f2962c16
Merge pull request #16830 from pratu16x7/explore-2.0
...
minor(modules): add onboard keys, remove hidden
2019-03-04 14:39:29 +05:30
scmmishra
28dd4c139e
feat: Added test for Topic Doctype
...
- Added test for get_contents function
- Removed unused class functions
2019-03-04 14:21:22 +05:30
Prateeksha Singh
8aa4594b1e
feat(modules): add onboard keys, remove hidden
2019-03-04 14:00:26 +05:30
Rohit Waghchaure
9842ce5a79
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 13:39:52 +05:30
deepeshgarg007
511713e131
fix: Delete GL entry for supplier before creating new one
2019-03-04 13:25:39 +05:30
deepeshgarg007
e615051ccc
fix: Updated test_united_states
2019-03-04 13:22:51 +05:30
Deepesh Garg
44ff41188d
fix: Selling and buying amount precision fix ( #16764 )
2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7
fix: Print letter head only if checked in Print Settings ( #16789 )
...
Letter head is printed in financial statements even if option is not checked
2019-03-04 12:53:11 +05:30
Deepesh Garg
e1f72cc010
revert: Address and contact report fix ( #16786 )
...
Reverts #16674
Address and other info are not visible in address and contact report
2019-03-04 12:49:39 +05:30
Anurag Mishra
1e4e61bd94
Minor fixes
2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68
minor fixes
2019-03-04 12:27:41 +05:30
deepeshgarg007
f6d1f53aef
fix: Account type fix in test_united_states
2019-03-04 10:23:35 +05:30
Mangesh-Khairnar
83f1fbdc4e
test: assert validation error for sales order on hold
2019-03-02 22:24:23 +05:30
Rohit Waghchaure
2bfb063fdb
fix(sales order item): not able to search item by description
2019-03-02 21:47:55 +05:30
Mangesh-Khairnar
3ebeac13e9
feat: add resume funtionality for sales order on hold
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
86e650c1ed
feat: validate linked sales order on material request creation
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
8f7c7a6882
feat: check for on hold sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
4f350fcadb
feat: validate sales order in sales invoice
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
1c276e9828
feat: validate on hold sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
602223dd55
feat: add a option of on hold in sales order
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
5eb66aed77
feat: add on hold status check
2019-03-02 20:48:03 +05:30
Mangesh-Khairnar
e17b7095bf
feat(sales order on hold): check status of sales order to validate entry
2019-03-02 20:48:03 +05:30
Jay Parikh
c2090939d7
Fix Sales Invoice Return Validation "validate_pos"
2019-03-02 12:19:32 +00:00
Rohit Waghchaure
4ef924d0ba
fix: on save state code field become blank
2019-03-01 18:11:43 +05:30
Frappe Bot
8f0660ab31
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
Frappe Bot
3ec0bb7e53
bumped to version 11.1.13
2019-03-01 09:12:25 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix
...
fix(regional,italy): bank details, custom button on sales invoice
2019-03-01 14:26:07 +05:30
rohitwaghchaure
5e71a56c7a
Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate
...
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
2019-03-01 14:25:00 +05:30
Gaurav
6a4625b94c
fix(regional,italy): codacy fixes in regional sales_invoice js
2019-03-01 13:58:39 +05:30
Gaurav
b30a9b1869
fix(regional,italy): bank details, custom button on sales invoice
...
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total
...
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
2019-03-01 11:57:06 +05:30
Rushabh Mehta
94d6f94e0e
Merge pull request #16421 from agritheory/usregional
...
feat: US Regional Module with IRS 1099 reporting
2019-03-01 09:14:18 +05:30
scmmishra
471140c6d4
fix: Minor changes
2019-02-28 18:14:25 +05:30
scmmishra
f0a56b977a
feat: Minor fixes to profile page
2019-02-28 18:11:46 +05:30
scmmishra
ab8fc8c2bf
feat: Quizzes fixed
2019-02-28 16:42:37 +05:30
scmmishra
3726f8a7f6
feat: Added check for no content in topic meta
2019-02-28 16:33:53 +05:30
scmmishra
b793cc8e1e
fix: Minor changes
2019-02-28 16:33:38 +05:30
Rohit Waghchaure
c21cda2790
Removed validation for group by voucher in general ledger
2019-02-28 16:20:45 +05:30
Frappe Bot
1fcae10258
Merge branch 'master' into develop
2019-02-28 10:20:48 +00:00
scmmishra
5e61b17cf8
fix: Routing after finishing a course topic
2019-02-28 15:43:33 +05:30
scmmishra
de5f71ae9e
fix: Showing Topic Progress
2019-02-28 15:40:49 +05:30
Frappe Bot
58135976dd
bumped to version 11.1.12
2019-02-28 10:08:08 +00:00
scmmishra
b17d289bda
fix: Course card progress
2019-02-28 15:21:43 +05:30
Rohit Waghchaure
ab4ff984c4
fix: scan barcode not adding the barcode value in the items table
2019-02-28 13:31:02 +05:30
Rushabh Mehta
57128e413c
fix: task.js
2019-02-28 12:43:58 +05:30
Himanshu Warekar
3315a9fafb
fix routes
2019-02-28 11:51:36 +05:30
Himanshu Warekar
1cb695b7e9
fix route for Task and Tree of Procedure
2019-02-28 11:42:36 +05:30
rohitwaghchaure
1d41c1c2de
Merge pull request #16787 from rohitwaghchaure/italian_more_fixes
...
fix: e-invoicing patch, patch to set country code in the address
2019-02-28 11:28:04 +05:30
Rohit Waghchaure
b48effebce
fix: test case
2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670
fix: bom cost update is not working
2019-02-27 18:01:30 +05:30
scmmishra
56ad5da090
fix: Minor Changes
2019-02-27 15:32:36 +05:30
Rohit Waghchaure
74cfe57716
fix: e-invoicing patch, patch to set country code in the address
2019-02-27 14:38:36 +05:30
Anurag Mishra
a9a1552e32
refactor
2019-02-27 14:10:24 +05:30
scmmishra
e6735e418f
fix: Content navigation
2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1
Fix: Content title fields
2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661
fix: Reloading bug on Content page
2019-02-27 12:24:17 +05:30
scmmishra
23880ae567
fix: Content fetching for articles and videos
2019-02-27 12:09:57 +05:30
scmmishra
628659e02a
fix: Routing for course
2019-02-27 12:09:28 +05:30
Rushabh Mehta
fcd0556119
Merge pull request #16709 from rmehta/project-template
...
feat: Project Template
2019-02-27 09:22:12 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master
...
fix: call base class onload method
2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808
fix: call base clase onload method
2019-02-26 18:01:37 +01:00
scmmishra
90b503621b
fix: Content Routing
2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287
fix: TopicMeta fixes
2019-02-26 17:11:01 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
Sagar Vora
5a14e46a1b
bumped to version 11.1.11
2019-02-26 17:28:58 +05:50
scmmishra
03c4c635e0
fix: list title on CoursePage
2019-02-26 16:54:32 +05:30
scmmishra
95bb3c0ee9
Minor fixes
2019-02-26 16:49:58 +05:30
scmmishra
c011b08699
fix: Fixed UI and API for course page
2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77
fix: Fixed API and UI for topic card
2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849
fix: Minor UI fixes
2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb
style: Minor code formatting
2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978
fix: Course Card shows topic list
2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f
fix: Route for course page
2019-02-26 16:47:10 +05:30
scmmishra
3866dee3e1
feat: Corse doctype
2019-02-26 16:37:31 +05:30
Rushabh Mehta
45c252a240
fix(test): test_task.py
2019-02-26 16:18:46 +05:30
Nabin Hait
39c489bfdc
Merge pull request #16781 from deepeshgarg007/summary
...
fix: Make company filter mandatory in sales person wise transaction summary
2019-02-26 16:00:51 +05:30
Nabin Hait
be5124fe10
Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing
...
fix: multiple e-invoicing issues for italy region
2019-02-26 15:52:56 +05:30
Rohit Waghchaure
0f98cb8b83
fix: multiple e-invoicing issues for italy region
2019-02-26 15:09:27 +05:30
Rushabh Mehta
b94c8b1c77
fix(tests): add test for bulk complete / cancellation of project
2019-02-26 14:30:38 +05:30
Rushabh Mehta
02a9ec33ed
BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk
2019-02-26 14:30:38 +05:30
Rushabh Mehta
2d2d176e5c
fix: linting
2019-02-26 14:30:38 +05:30
Rushabh Mehta
e9984672ce
feat: Project Template
2019-02-26 14:30:38 +05:30
Saurabh
acf83791ab
fix: file api
2019-02-26 13:58:18 +05:30
deepeshgarg007
d2d84e3c9d
fix: Company filter fix
2019-02-26 11:52:22 +05:30
Suraj Shetty
5636f924a9
fix: get mode of payment while selecting payment term in payment term template ( #16765 )
2019-02-25 12:43:34 +05:30
Nabin Hait
9990306399
fix: Consider only active BOMs while updating cost via BOM Update Tool ( #16753 )
2019-02-25 11:59:05 +05:30
Rushabh Mehta
e2de8e0fa5
fix: expense claim type ( #16760 )
2019-02-25 11:56:30 +05:30
Suraj Shetty
2dadc1ef98
chore: Remove trailing whitespaces
2019-02-21 20:51:35 +05:30
deepeshgarg007
bf6b36a39b
fix: Removed white spaces
2019-02-21 19:30:27 +05:30
deepeshgarg007
56b52d43e6
Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item
2019-02-21 18:30:02 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Saurabh
76cd402ca5
bumped to version 11.1.10
2019-02-21 18:55:28 +06:00
Saurabh
e5ff28a92c
Merge pull request #16754 from deepeshgarg007/state_code
...
fix: State code issue fix
2019-02-21 18:21:24 +05:30
Nabin Hait
367d7c104e
Merge pull request #16724 from rohitwaghchaure/user_progress_issue
...
fix: user progress issue
2019-02-21 18:13:52 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs
...
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty
...
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 18:11:37 +05:30
Nabin Hait
31f46b313c
Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue
...
fix: not able to cancel maintenance visit
2019-02-21 18:10:46 +05:30
Nabin Hait
e328869b10
Merge pull request #16738 from deepeshgarg007/unique_tree_options
...
fix: Filter out unique values for tree options
2019-02-21 18:09:42 +05:30
Nabin Hait
e3b1b11bc5
Merge pull request #16740 from nabinhait/leave-calendar
...
fix: Calendar events for leaves considering user permissions
2019-02-21 18:08:19 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing
...
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit
...
fix: Decimal point issue in gross profit print
2019-02-21 18:07:14 +05:30
deepeshgarg007
1915e15a9e
fix: State code issue fix in regional module(Italy)
2019-02-21 17:55:57 +05:30
rohitwaghchaure
a49f59fcec
Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero
...
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:50:51 +05:30
Rohit Waghchaure
90691dc0d8
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:18:28 +05:30
Nabin Hait
b24caad789
fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings
2019-02-21 17:11:35 +05:30
Rohan Bansal
143973166f
fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests
2019-02-21 15:57:06 +05:30
Suraj Shetty
463a3cf8cf
Merge pull request #16725 from deepeshgarg007/item_dashboard
...
fix: Item name display issue fix in item dashboard
2019-02-21 14:42:38 +05:30
Nabin Hait
26972c954d
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 14:32:41 +05:30
deepeshgarg007
14ff6bfc32
fix: Decimal point issue in gross profit print
2019-02-21 12:08:32 +05:30
Nabin Hait
816a4655a0
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 12:02:36 +05:30
Nabin Hait
40c15d2e74
fix: Calendar events for leaves considering user permissions
2019-02-20 18:55:38 +05:30
Saurabh
482ebd2c7c
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
Saurabh
ada93e5d77
bumped to version 11.1.9
2019-02-20 18:44:17 +06:00
deepeshgarg007
0d64d622e5
fix: filter only unique values for tree options
2019-02-20 17:55:14 +05:30
rohitwaghchaure
485bd93dae
Merge pull request #16737 from saurabh6790/indentation_fixes
...
fix: reload report doc and indentation fixes
2019-02-20 17:40:50 +05:30
rohitwaghchaure
c18e925d61
fix: Moved regional methods from controller to hooks ( #16736 )
2019-02-20 17:13:15 +05:30
Saurabh
9fcfc63f77
fix: reload report doc and indentation fixes
2019-02-20 17:04:18 +05:30
rohitwaghchaure
ef3f864123
fix: not able to submit purchase order ( #16735 )
2019-02-20 15:47:06 +05:30
rohitwaghchaure
e141865c43
Merge pull request #16722 from rohitwaghchaure/stop_button_not_working
...
fix: stop button not working in material request
2019-02-20 12:30:26 +05:30
Sagar Vora
eba76c99a3
Merge branch 'master' into develop
2019-02-20 12:11:25 +05:30
Sagar Vora
d48393541d
bumped to version 11.1.8
2019-02-20 12:31:25 +05:50
Gaurav Naik
3bf0acbac6
fix(regional,italy): renamed validate hook for address ( #16732 )
2019-02-20 12:08:53 +05:30
Rohit Waghchaure
7e02e1c3cd
fix: not able to cancel maintenance visit
2019-02-19 22:53:31 +05:30
deepeshgarg007
1b04534095
fix: Removed duplicate fields from BOM Item
2019-02-19 21:36:12 +05:30
deepeshgarg007
942c894f93
fix: fetch item name in item dashboard
2019-02-19 19:51:23 +05:30
Rohit Waghchaure
f4049f9dfd
fix: user progress issue
2019-02-19 19:46:14 +05:30
Rohit Waghchaure
389cd6ad63
fix: stop button not working in material request
2019-02-19 19:18:07 +05:30
scmmishra
62968b318f
wip
2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Sagar Vora
f5c511c193
bumped to version 11.1.7
2019-02-19 18:14:14 +05:50
Nabin Hait
2c23f98b65
Merge pull request #16721 from nabinhait/ar-ap-fix
...
fix: AR/AP report based on account type
2019-02-19 17:45:30 +05:30
Gaurav
3f046136d4
fix(regional,italy): added state code on address, updated patch
...
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
2019-02-19 17:28:36 +05:30
Nabin Hait
e4f73929c4
fix: AR/AP report based on account type
2019-02-19 17:11:50 +05:30
scmmishra
cb8ef96f6b
chore (css): Switched to frappe navbar
2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36
fix (css): Removed container class
2019-02-19 17:01:31 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes
2019-02-19 15:07:46 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision
...
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix
2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
...
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
...
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
Gaurav
2670ad7eb2
mod(regional,italy): adjusted calculation logic for charges
...
validation for missing code on mode of payment
UOM from settings
Replace str with cstr
2019-02-19 13:15:25 +05:30
scmmishra
765529241e
[Major][Breaking] More changes
2019-02-19 13:06:33 +05:30
scmmishra
da39da627c
[Major][Breaking] Server side changes to handle Topic Layer
...
- Moved `get_course_progress` to CourseEnrollment class.
- Added Topic context to progress functions in lms.py
- Create user on creation of a student
2019-02-19 13:06:33 +05:30
scmmishra
cc7290b7af
[Major][Breaking] Student Class
2019-02-19 13:06:33 +05:30
scmmishra
766f68a20a
[Major][Breaking] Modified lms.py and utils
2019-02-19 13:06:33 +05:30
scmmishra
e7d52c594b
[Major][Breaking] Program Enrollment Creates Course enrollment
2019-02-19 13:06:33 +05:30
scmmishra
1253061055
[Major][Breaking] Modified Course Doctype, added Topic based functions
2019-02-19 13:06:33 +05:30
scmmishra
42f50fd82c
[Major][Breaking] Added Topic Layer in Course
2019-02-19 13:06:33 +05:30
scmmishra
699f7c6fee
Minor changes
2019-02-19 13:06:33 +05:30
scmmishra
42f3c51ff7
Removed Content Doctype
2019-02-19 13:06:33 +05:30
scmmishra
6663ca1d7f
Adding Test Utils
2019-02-19 13:06:33 +05:30
scmmishra
c51f738b03
Refactored student creation
2019-02-19 13:06:33 +05:30
scmmishra
689500d081
Minor UI Fixes
2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0
UI Improvements: Added Custom Navbar
2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d
Added quiz card on profile page
2019-02-19 13:06:33 +05:30
scmmishra
4d10229cef
Quiz Progress and Minor fixes
2019-02-19 13:06:33 +05:30
scmmishra
c84a318591
Student and User link for LMS added
2019-02-19 13:06:33 +05:30
scmmishra
b3154efa84
UI Fixes
2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d
More Improvements
2019-02-19 13:06:33 +05:30
scmmishra
02420bd4ba
Client side improvements
2019-02-19 13:06:33 +05:30
scmmishra
edc54cd5f6
Minor improvements for CardList.vue
2019-02-19 13:06:33 +05:30
scmmishra
2955851867
Built Student Profile Page
2019-02-19 13:06:33 +05:30
scmmishra
308f235859
Added Profile page
2019-02-19 13:06:33 +05:30
scmmishra
201fec3101
Minor Improvements
2019-02-19 13:06:33 +05:30
scmmishra
97c994f394
create course enrollment if not already enrolled for a program
2019-02-19 13:06:33 +05:30
scmmishra
affbfe7d0c
Added get_program_meta
2019-02-19 13:06:33 +05:30
scmmishra
cbb7c7ff23
ui fixes
2019-02-19 13:06:33 +05:30
scmmishra
cc755f6204
Doctype Changes for Beta Release
2019-02-19 13:06:33 +05:30
scmmishra
788ffbd5b6
Minor improvements
2019-02-19 13:06:33 +05:30
scmmishra
9229f4fc92
UI fixes
2019-02-19 13:06:33 +05:30
scmmishra
082e3c94ef
Minor Fixes: Student Enrollment
2019-02-19 13:06:32 +05:30
scmmishra
fdbabde80a
UI fixes for course card
2019-02-19 13:06:32 +05:30
scmmishra
be7fadc521
Renamed CoursePage to ContentPage
2019-02-19 13:06:32 +05:30
scmmishra
d93cec374d
Minor UI changes
2019-02-19 13:06:32 +05:30
scmmishra
a592f70d4a
Refactored Course Progression Logic
2019-02-19 13:06:32 +05:30
scmmishra
1192529698
Refactored lms.py, modified utils
2019-02-19 13:06:32 +05:30
scmmishra
8951c165f0
Fixed major bugs
2019-02-19 13:06:32 +05:30
scmmishra
53c2d5db63
Refactored lms store
2019-02-19 13:06:32 +05:30
scmmishra
0a5c7a6b46
Removed unnecessary prints
2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c
Refactored server side code
2019-02-19 13:06:32 +05:30
scmmishra
19e12ac3d6
Minor changes to quiz doctype
2019-02-19 13:06:32 +05:30
scmmishra
80ecc56cbe
Using lms.call across the Vue app
2019-02-19 13:06:32 +05:30
scmmishra
0a4902f8b5
UI Changes
2019-02-19 13:06:32 +05:30
scmmishra
c5a1226e93
Refactored State management store
2019-02-19 13:06:32 +05:30
scmmishra
85c2feec0d
Added ListPage and other UI improvements
2019-02-19 13:06:32 +05:30
scmmishra
efb01c3f75
Renamed components
2019-02-19 13:06:32 +05:30
scmmishra
2596ea0816
Renamed Vue Files
2019-02-19 13:06:32 +05:30
scmmishra
0225642459
Renamed Pages
2019-02-19 13:06:32 +05:30
scmmishra
8ff1028665
Renamed AcademyRoot to lmsRoot
2019-02-19 13:06:32 +05:30
scmmishra
1fbe2d4b2b
Renamed academy to lms (Client Side)
2019-02-19 13:06:32 +05:30
scmmishra
35bf561a6f
Renamed academy to lms on server side
2019-02-19 13:06:32 +05:30
scmmishra
44921a3ee9
Renamed default element for Vue to mount on
2019-02-19 13:06:32 +05:30
scmmishra
91bbe776c1
Modified academy.call to point to erpnext.www.lms
2019-02-19 13:06:32 +05:30
scmmishra
af30b771f0
Renamed academy to lms on server side
2019-02-19 13:06:32 +05:30
scmmishra
f9f7318d3f
Deleted Old LMS Content
2019-02-19 13:06:32 +05:30
scmmishra
d7c993f028
Minor UI changes
2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717
Fixed course and content page
2019-02-19 13:06:32 +05:30
scmmishra
db9c8b795a
Functions now have a login context
2019-02-19 13:06:32 +05:30
scmmishra
708756ed40
Added academy namespace
2019-02-19 13:06:32 +05:30
scmmishra
892b0c23fc
Added class functions
2019-02-19 13:06:31 +05:30
scmmishra
cc166c01eb
Improved Client implementation
2019-02-19 13:06:31 +05:30
scmmishra
c1b1a5ec37
Permission Changes
2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37
More Bug fixes UI and Permissions
2019-02-19 13:06:31 +05:30
scmmishra
05e07b44b1
Removed unused utils functions
2019-02-19 13:06:31 +05:30
scmmishra
734a746687
Minor DocType changes
2019-02-19 13:06:31 +05:30
scmmishra
b409f7a388
Minor UI Changes and Fixes
2019-02-19 13:06:31 +05:30
scmmishra
850dfd0358
Set appropriate permissions
2019-02-19 13:06:31 +05:30
scmmishra
9f316a3b30
Permission changes
2019-02-19 13:06:31 +05:30
scmmishra
86897b3cc8
UI: Kinda fixed "Completed" button render issue
2019-02-19 13:06:31 +05:30
scmmishra
5611bf4e29
Minor change
2019-02-19 13:06:31 +05:30
scmmishra
25e42baeaf
Course completion logic complete
2019-02-19 13:06:31 +05:30
scmmishra
a920bca044
Minor UI fixes
2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06
Added methods to saving Quiz attempts
2019-02-19 13:06:31 +05:30
scmmishra
76222f7acc
Modified add-activity, no duplicates will be saved now
2019-02-19 13:06:31 +05:30
scmmishra
a3afe2a998
Sending session data explicitly
2019-02-19 13:06:31 +05:30
scmmishra
cfce153ed4
Minor UI changes
2019-02-19 13:06:31 +05:30
scmmishra
1f4835b3b4
Added Video UI
2019-02-19 13:06:31 +05:30
scmmishra
6de9cbb52d
Solved minor issue (Last activity not being saved)
2019-02-19 13:06:31 +05:30
scmmishra
1a04f774d7
LMS: Saving Course Activity
2019-02-19 13:06:31 +05:30
scmmishra
7d5e218155
Modified Quiz Evaluation
2019-02-19 13:06:31 +05:30
scmmishra
ed5892c7a5
UI: Components rendered based on student progress
2019-02-19 13:06:31 +05:30
scmmishra
a054655442
Updated state functions for session management
2019-02-19 13:06:31 +05:30
scmmishra
90722e3a9b
Fixed Permissions for LMS User
2019-02-19 13:06:31 +05:30
scmmishra
73a31ec7bb
Added functions to query Student enrollments
2019-02-19 13:06:31 +05:30
scmmishra
91aa0e07c8
Added class function for student enrollment
2019-02-19 13:06:31 +05:30
scmmishra
734d3e084c
Set home page for LMS User
2019-02-19 13:06:31 +05:30
scmmishra
8b8db54ef4
Added enroll function
2019-02-19 13:06:30 +05:30
scmmishra
15012c08a4
UI Fixes
2019-02-19 13:06:30 +05:30
scmmishra
72fd3bc0ea
Removed unnecessary watcher
2019-02-19 13:06:30 +05:30
scmmishra
3c412f56c9
UI: Changes to AcademyTopSection
2019-02-19 13:06:30 +05:30
scmmishra
bcafe84bb6
Adding session management to client
2019-02-19 13:06:30 +05:30
scmmishra
7a19b63837
Minor changes
2019-02-19 13:06:30 +05:30
scmmishra
e30f2eb297
Re-factored CourseCard UI
2019-02-19 13:06:30 +05:30
scmmishra
6678f5b88e
Added custom store for state management
2019-02-19 13:06:30 +05:30
scmmishra
ef9a75e50d
Removed unnecessary print statements
2019-02-19 13:06:30 +05:30
scmmishra
cd0cab78a5
Quiz UI Working
2019-02-19 13:06:30 +05:30
scmmishra
f9e8e4e2d3
Modified question.py
2019-02-19 13:06:30 +05:30
scmmishra
f7029f084c
Quiz is now submittable
2019-02-19 13:06:30 +05:30
scmmishra
cfc35f4424
Quiz: Save responses as an object
2019-02-19 13:06:30 +05:30
scmmishra
d2e040b6f1
Added separate ContentTitle component
2019-02-19 13:06:30 +05:30
scmmishra
160d8b0914
Added separate ContentTitle component
2019-02-19 13:06:30 +05:30
scmmishra
d87ca178d8
UI for Quiz
2019-02-19 13:06:30 +05:30
scmmishra
374184414b
Added quiz functions
2019-02-19 13:06:30 +05:30
scmmishra
7a59f9501e
UI for Content
2019-02-19 13:06:30 +05:30
scmmishra
bcafbea481
UI for Course page
2019-02-19 13:06:30 +05:30
scmmishra
b43ab3317c
UI for home page and program page
2019-02-19 13:06:30 +05:30
scmmishra
9c642ace52
Helper Functions for VueJS
2019-02-19 13:06:30 +05:30
scmmishra
84297fa349
Starting with VueJS
2019-02-19 13:06:30 +05:30
scmmishra
1778b59efa
Started with Vue
2019-02-19 13:06:30 +05:30
scmmishra
9456c82536
Getting started with Vue
2019-02-19 13:06:29 +05:30
scmmishra
5e758aea00
Minor Changes
2019-02-19 13:06:29 +05:30
scmmishra
75ad128912
Added LMS Settings
2019-02-19 13:06:29 +05:30
scmmishra
9e80f32e2a
Minor Changes
2019-02-19 13:06:29 +05:30
scmmishra
1e1f1ad186
LMS: Course Completion Status Working
2019-02-19 13:06:29 +05:30
scmmishra
a8703d4036
LMS: Changes to Course Activity Doctype, Course Activity Tracking Works
...
Co-authored-by: Sahil <sahilkhan28297@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
57c77e452b
LMS: Course Activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
7409fe6438
LMS: Quiz Eval and Max Attempts Check
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
3574ac3f5e
quiz_activity: add quiz activity
...
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
3bf71a2df6
Quiz Logic
2019-02-19 13:06:29 +05:30
scmmishra
d133e8229b
Quiz Evaluation Logic
2019-02-19 13:06:29 +05:30
scmmishra
4f439ec4dd
Quiz eval utils
2019-02-19 13:06:29 +05:30
scmmishra
0d4135ec2b
LMS: Fixed view for Quiz
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
91bbe10495
LMS: More changes to the web view
2019-02-19 13:06:29 +05:30
scmmishra
5569cbf82c
Revert "LMS: Fixed views for article and video"
...
This reverts commit 9b7585405f7e25dcdcba4e131066d6b57a1d8899.
2019-02-19 13:06:29 +05:30
scmmishra
1e10fc43f4
LMS: Fixed views for article and video
2019-02-19 13:06:29 +05:30
scmmishra
590227b107
LMS: Fixed views for article and video
2019-02-19 13:06:29 +05:30
scmmishra
18baff5fec
Minor changes to question doctype
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
541a522b26
LMS:Added class methods for course, program and student doctypes
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
1869419bdc
lms: refactor entire course model
...
each course item now has its own doctype.
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
685584bf56
Quiz: Quiz now displays correctly on the portal
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
3757a4eab8
Modified program and index view
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
fa2db3c41b
LMS: Added functions to get LMS contents
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
82df4378de
Changes to get_quiz function
2019-02-19 13:06:28 +05:30
scmmishra
3cbb9795a4
Minor changes to doctypes
2019-02-19 13:06:28 +05:30
scmmishra
f9cef33e41
Dashboard changes for student and program
2019-02-19 13:06:28 +05:30
scmmishra
5311e3898c
General Changes
2019-02-19 13:06:28 +05:30
scmmishra
31cbe3c0dc
Added function to retrieve quiz data as JSON
2019-02-19 13:05:23 +05:30
scmmishra
d1650b9f63
Modified Question doctype for a better design
2019-02-19 13:05:23 +05:30
scmmishra
1fc45c547b
Added Course Enrollment doctype
2019-02-19 13:05:23 +05:30
scmmishra
06d175a2bd
Added Quiz Activity doctype
2019-02-19 13:05:23 +05:30
scmmishra
e7308125b4
Replaced Student Course Activity with Course Activity
2019-02-19 13:05:23 +05:30
scmmishra
17294e703e
Course Activity linked to Student ID
2019-02-19 13:05:23 +05:30
scmmishra
38c1baf719
Templates: modified routing logic, added data attributes in template
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
9335593b56
LMS: JS Script to send quiz and activity data
2019-02-19 13:05:23 +05:30
scmmishra
4ae11f4d74
LMS: added python functions to evaulate quiz and save student activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
eab0b833a1
Modified Student Course Activity Doctype
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
6660a675f1
templates: add templates for LMS content
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
de36e13db7
modified doctypes for lms
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
836a4b5e54
lms: add activity child table and create frontend
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
b3b003f518
course_activity: create doctype for tracking student course activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
55e7c1a866
api: create user account for student
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
43da645be0
Added Web Academy Applicant doctype
2019-02-19 13:05:23 +05:30
scmmishra
4e208e99bc
Added Student Course Acitivity doctype
2019-02-19 13:05:23 +05:30
scmmishra
8c41abc2df
Modified education menu items
2019-02-19 13:03:59 +05:30
scmmishra
84a49d5ea7
Modified Content doctype, added question child table for quiz
2019-02-19 13:03:59 +05:30
scmmishra
f05837a895
Updated Content Doctype
2019-02-19 13:03:59 +05:30
scmmishra
abd1d209fb
Added Content Doctype
2019-02-19 13:03:59 +05:30
Gaurav
f1e28e0e8d
mod(regional,italy): Updates to Italian Localization
...
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Gaurav
a4aa80fe05
feature(regional): Italian Localization
...
Added setup.py for italy under regional
Included fiscal regimes, tax exemption reasons and custom fields
Issue #16259
2019-02-19 10:39:10 +05:30
Jigar Tarpara
1ac17ec1c4
Add credit month in validation
2019-02-19 10:21:01 +05:30
deepeshgarg007
de0f59b818
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad
fix: multi-uom not working for the pricing rule rate
2019-02-18 20:07:44 +05:30
Nabin Hait
750fe6eaea
fix: get item rate in bom
2019-02-18 18:56:08 +05:30
deepeshgarg007
9a19e06856
fix: Change Received qty to accepted qty and validation for indicators
2019-02-18 18:42:15 +05:30
Rohit Waghchaure
99e7362006
fix: Allow to make material request from draft job card
2019-02-18 18:26:50 +05:30
deepeshgarg007
48a7262fae
fix: Precision issue in POS payment
2019-02-18 15:05:36 +05:30
Anurag Mishra
879e5fd8bb
remove print and codacy
2019-02-18 14:43:55 +05:30
Anurag Mishra
42a106c7ba
Auditors print formats
2019-02-18 14:35:33 +05:30
rohitwaghchaure
1bcbe9069b
Merge pull request #16610 from jay-parikh/hotfix
...
fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile
2019-02-18 12:43:57 +05:30
Rushabh Mehta
20db65ef77
Merge pull request #16694 from rmehta/refactor-comments
...
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-18 12:05:35 +05:30
Anurag Mishra
61f981ae05
Changes Requested
2019-02-18 11:43:32 +05:30
Rushabh Mehta
f3b33f3ab2
Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features
...
feat(marketplace): seller profile page
2019-02-18 11:24:01 +05:30
Rushabh Mehta
1a6668ef3c
Merge pull request #16633 from pratu16x7/explore-2.0
...
feat(modules): Add getting started and help desk, merge settings
2019-02-18 11:20:14 +05:30
Rushabh Mehta
39c106dd05
fix(test): rename test in test_customer
2019-02-18 11:16:59 +05:30
Suraj Shetty
053d6a2ca1
Move reload doc before get query
2019-02-17 11:24:51 +05:30
Suraj Shetty
3a2f342ac1
Ignore duplicate entry
2019-02-16 21:09:24 +05:30
Suraj Shetty
1399fbe986
Move patch
2019-02-16 21:02:34 +05:30
Suraj Shetty
8cbe824c5b
Rerun item_barcode_chidtable_migrate patch
2019-02-16 17:54:15 +05:30
Suraj Shetty
cc0222a28a
Remove unwanted barcode field from item
2019-02-16 17:53:23 +05:30
Rushabh Mehta
7bb9eae685
Merge pull request #16541 from alyf-de/develop
...
feat(regional): Germany module with address template
2019-02-16 10:54:28 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Frappe Bot
acf26c8569
bumped to version 11.1.6
2019-02-15 10:22:32 +00:00
Faris Ansari
8a01342e48
fix: Remove comment
2019-02-15 15:14:38 +05:30
Nabin Hait
09a4df74f0
Merge pull request #16645 from nabinhait/tds-fix
...
fix: Ignore tds account while creating tax withholding category
2019-02-15 14:53:30 +05:30
Nabin Hait
eb0627356b
Merge pull request #16650 from nabinhait/general-ledger-fix
...
fix: show values in account/party currency based in actual entry, no conversion
2019-02-15 14:53:12 +05:30
Nabin Hait
b5c249583a
Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux
...
fix: Barcode scanning UX
2019-02-15 14:52:42 +05:30
Nabin Hait
b819f104e6
Merge pull request #16653 from nabinhait/item-variants
...
fix: Enqueued item variants updation if there are more than 30 variants
2019-02-15 14:51:14 +05:30
Nabin Hait
c45962e3ef
Merge pull request #16675 from deepeshgarg007/purchase-fix
...
fix: Purchase order item description fix
2019-02-15 14:50:38 +05:30
Nabin Hait
aa80a223d8
Merge pull request #16674 from deepeshgarg007/address-rep-fix
...
fix: Address and contact report
2019-02-15 14:26:16 +05:30
Nabin Hait
8788a5c712
Merge pull request #16676 from nabinhait/get-item-details
...
fix: get item details
2019-02-15 14:24:46 +05:30
Nabin Hait
b1cbe221b7
Merge pull request #16677 from nabinhait/total-qty-patch-fix
...
fix: Consider parenttype while updating total qty in transactions
2019-02-15 14:24:30 +05:30
Nabin Hait
a0c9c7501b
Update update_total_qty_field.py
2019-02-15 14:24:08 +05:30
Tropicalrambler
3a88bc43dc
fix: typo in salary register report field name ( #16670 )
...
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
2019-02-15 13:40:44 +05:30
Sagar Vora
379e6a4635
Merge branch 'hotfix' into address-rep-fix
2019-02-15 13:08:42 +05:30
Nabin Hait
4df7679c65
fix: Get outstanding invoices
2019-02-15 13:08:04 +05:30
Sagar Vora
ebdd8a9710
Merge branch 'hotfix' into purchase-fix
2019-02-15 13:04:32 +05:30
Sagar Vora
921f468950
Merge branch 'hotfix' into get-item-details
2019-02-15 13:03:04 +05:30
Nabin Hait
6f7a4d94ce
fix: Consider parenttype while updating total qty in transactions
2019-02-14 19:34:43 +05:30
Nabin Hait
f66c6874ca
Merge pull request #16652 from nabinhait/work-order-fix
...
fix: Make work order from production plan considering already ordered qty
2019-02-14 18:50:30 +05:30
Nabin Hait
54f8ed1282
Merge branch 'hotfix' into item-variants
2019-02-14 18:50:11 +05:30
Nabin Hait
c3698e458f
Merge pull request #16666 from nabinhait/deferred-revenue-fix
...
fix: errors in deferred revenue booking
2019-02-14 18:49:01 +05:30
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix
2019-02-14 18:37:40 +05:30
Nabin Hait
0d1ccc357f
fix: get item details
2019-02-14 18:30:10 +05:30
deepeshgarg007
867ca63750
fix: Purchase order item description fix
2019-02-14 18:10:47 +05:30
Deepesh Garg
20008946a3
Merge branch 'hotfix' into address-rep-fix
2019-02-14 17:37:41 +05:30
Deepesh Garg
4902f7b2a0
fix: Show tasks in timesheet with status as Closed ( #16660 )
2019-02-14 17:32:52 +05:30
deepeshgarg007
34f4f24e21
fix: Address and contact report
2019-02-14 17:26:49 +05:30
Nabin Hait
29fcb14c42
fix: errors in deferred revenue booking
2019-02-13 17:18:12 +05:30
Deepesh Garg
4d1bc0ca85
fix: Add total row in analytics report ( #16648 )
2019-02-13 16:58:46 +05:30
Anurag Mishra
4f0fd38209
refractor
2019-02-13 16:46:05 +05:30
Faris Ansari
a748ca69e7
fix: Validate invalid fields in Item Variant Settings
...
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
2019-02-13 13:02:39 +05:30
rohitwaghchaure
a0aaeafae8
Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg
...
fix: validation message for work order
2019-02-13 09:49:25 +05:30
Faris Ansari
795102125c
Merge branch 'hotfix' into fix-barcode-scanning-ux
2019-02-12 18:31:06 +05:30
Nabin Hait
db527bfb24
fix: Enqueued item variants updation if there are more than 30 variants
2019-02-12 18:30:00 +05:30
Nabin Hait
1a3c27bbea
fix: Make work order from production plan considering already ordered qty
2019-02-12 17:38:37 +05:30
Faris Ansari
5631ffca68
fix: Barcode scanning UX
2019-02-12 17:12:48 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50
fix: show values in account/party currency based in actual entry, no conversion
2019-02-12 16:41:20 +05:30
Sagar Vora
6837ae3377
bumped to version 11.1.5
2019-02-12 16:54:29 +05:50
karthikeyan5
4324dc6ea8
fix(marketplace): fixing hubmarket server specific error
2019-02-12 15:12:23 +05:30
karthikeyan5
4df6003bd9
feat(marketplace): seller profile page
2019-02-12 15:12:23 +05:30
karthikeyan5
2894f7935a
feat(marketplace): featured Items for sellers
2019-02-12 15:12:23 +05:30
karthikeyan5
88baf53cc1
feat(marketplace): navigation link to seller profile from item page
2019-02-12 15:12:23 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes
...
Multiple fixes
2019-02-12 13:56:06 +05:30
Prateeksha Singh
426468183f
fix(getting_started): main domain specific masters
2019-02-12 13:08:21 +05:30
Nabin Hait
c46d995480
Merge pull request #16628 from Zlash65/fix-noti-patch
...
fix: Notification Control delete
2019-02-12 13:04:45 +05:30
Nabin Hait
e6abee4bd5
Merge pull request #16643 from Zlash65/field-fix
...
fix: Fieldtype and Fetch From fixes
2019-02-12 13:04:00 +05:30
Nabin Hait
ca536efe7b
Merge pull request #16640 from nabinhait/pur_reg_fix
...
fix: show project even if PI is directly created
2019-02-12 13:01:18 +05:30
Deepesh Garg
da7c20e474
fix: Validate task dates in project ( #16586 )
...
* fix: Validate task dates in project
* fix: Test case fix and validation only if date exists
* fix: Added dates in error messages
2019-02-12 12:55:50 +05:30
Rohit Waghchaure
e0412a177c
fix: validation message for work order
2019-02-12 11:47:16 +05:30
Zlash65
fc88029d7d
fix: fix item field for clinical procedure template
2019-02-12 11:38:27 +05:30
Zlash65
b614fb1d45
fix: make finance book field as link field and rectify fetch_from
2019-02-12 11:30:58 +05:30
Nabin Hait
afef9c1cc7
fix: Ignore tds account while creating tax withholding category
2019-02-12 11:28:20 +05:30
Zlash65
fd3998cfc9
fix: make branch as link field
2019-02-12 11:27:23 +05:30
Prateeksha Singh
9adad2988d
feat(getting_started): Minimum requirements to setup
2019-02-12 08:37:53 +05:30
Prateeksha Singh
08a6de6b41
fix(modules): shorten descriptions
2019-02-12 07:41:52 +05:30
Nabin Hait
ab50211e18
fix: show project even if PI is directly created
2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac
Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report
2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc
fix: codacy
2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report
2019-02-11 16:00:28 +05:30
sahil28297
1a7e438fb2
fix(pstch): allow duplicate entries ( #16632 )
2019-02-11 15:53:04 +05:30
Rohan Bansal
d635f722fc
fix(stock_balance): Make balance qty and value columns more visible
2019-02-11 15:22:01 +05:30
Prateeksha Singh
9d4a183074
fix(modules): Merge Settings into one, Setup --> Settings
2019-02-11 15:14:50 +05:30
rohitwaghchaure
d95c8cfac3
Merge pull request #16621 from netchampfaris/fix-warehouse-currency
...
fix: Set company_currency for Warehouse Tree
2019-02-11 14:58:02 +05:30
Prateeksha Singh
01a045a488
feat(modules): Add getting started and help desk
2019-02-11 14:01:04 +05:30
Anurag Mishra
a032f0528e
new report gross-and-net-profit-report
2019-02-11 13:12:44 +05:30
Zlash65
a206f06af9
delete notification control's docctype entry
2019-02-11 12:01:01 +05:30
Nabin Hait
bb6438af5a
Merge pull request #16537 from nabinhait/stock-balance-fix
...
fix: Fixed error on stock balance report
2019-02-11 11:00:01 +05:30
Rushabh Mehta
c8018bdeb1
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-09 21:10:29 +05:30
Faris Ansari
453964728d
fix: Set company_currency for Warehouse Tree
2019-02-09 20:27:42 +05:30
Nabin Hait
17e0513270
fix: message if stock reco is enqueued
2019-02-08 16:56:26 +05:30
Nabin Hait
8d4bb3e327
fix: backflush only if transferred item is present in work order
2019-02-08 16:56:26 +05:30
Nabin Hait
450fe309d6
fix: allow updating title of material request
2019-02-08 16:56:26 +05:30
Nabin Hait
e3b0f4f9f6
fix: removed account type filter on employee advance account
2019-02-08 16:56:26 +05:30
Nabin Hait
27af6b377f
fix: defered accounting fixes
2019-02-08 16:56:26 +05:30
Jay Parikh
1906f6da3a
Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588
2019-02-08 11:13:09 +00:00
Aditya Hase
e53a6a6723
Merge branch 'develop' into fix-py3
2019-02-08 12:51:05 +05:30
Nabin Hait
208ce5dcea
fix: removed module type for learn
2019-02-08 12:25:30 +05:30
Aditya Hase
13808b4cc9
fix(py3): Convert to float before comparison
2019-02-08 12:03:25 +05:30
Aditya Hase
2a3c39f38a
fix(py3): Convert dict.values() to list for indexing
2019-02-08 12:02:57 +05:30
Aditya Hase
46d7456782
fix(py3): Convert list to filter for indexing
2019-02-08 12:02:14 +05:30
Prateeksha Singh
e31cdb5b85
fix(modules): add ERPNext settings module
2019-02-08 08:06:23 +05:30
Aditya Hase
a86a569787
fix(py3): Convert dict.values() to list for indexing
2019-02-07 22:21:06 +05:30
Aditya Hase
3e954734d0
fix(py3): Convert filter to list for indexing
2019-02-07 22:21:05 +05:30
Aditya Hase
6e1bb60b58
fix(py3): Convert filter to list for indexing
2019-02-07 22:21:05 +05:30
Aditya Hase
e1f867f29f
fix(py3): Explicitly convert to float for comparison
2019-02-07 22:21:05 +05:30
Aditya Hase
d9ce732d3e
fix(py3): Explicitly convert to float for comparison
2019-02-07 22:21:05 +05:30
Aditya Hase
a9f20d801d
Merge pull request #16599 from adityahase/python3-fix
...
fix(py3): Use six.text_type instead of unicode
2019-02-07 22:20:41 +05:30
Aditya Hase
691c166a56
fix(py3): Use six.text_type instead of unicode
2019-02-07 20:35:52 +05:30
Aditya Hase
0b1dc32fcb
Merge pull request #16597 from adityahase/python3-fix
...
fix(py3): Use range instead of xrange
2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86
fix(py3): Use range instead of xrange
2019-02-07 18:10:30 +05:30
Prateeksha Singh
3423407314
feat(module_links): rearrange links
2019-02-07 09:58:22 +05:30
Prateeksha Singh
9b14d46c1d
purge(modules): remove old desktop icon configs
2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08
config(modules): Rearrange links
2019-02-07 09:58:22 +05:30
Prateeksha Singh
b5eb16faeb
feat(config): add some onboarding cues
2019-02-07 09:58:22 +05:30
Prateeksha Singh
ce27cffaad
refactor(desk_icon): Remove reference and patches to Desktop Icon
2019-02-07 09:58:21 +05:30
