Commit Graph

19336 Commits

Author SHA1 Message Date
Deepesh Garg
f9e4391998
Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop
feat: "Order Type" tree type for Sales Analytics report (develop)
2019-07-12 14:28:16 +05:30
Deepesh Garg
49c97922b4
Merge pull request #18189 from bhavishyasharma/feat-manufacturer-is-missing-contacts
feat: Manufacturer is Missing Contacts
2019-07-12 14:01:00 +05:30
Rucha Mahabal
9e35bff55c feat: Email Campaign 2019-07-12 13:56:36 +05:30
Rushabh Mehta
64897d26a4 fix(minor): open colour status for issue 2019-07-12 12:55:28 +05:30
Deepesh Garg
587bdf09eb
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 12:30:42 +05:30
Deepesh Garg
f7c151e7ba
Merge pull request #18241 from scmmishra/cash-flow-chart
feat: added chart to cash-flow report
2019-07-12 12:30:18 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972)
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
2019-07-12 12:28:34 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency 2019-07-12 12:24:05 +05:30
Himanshu
7d1d9aa46b feat(Issue): Reset SLA (#18244)
* feat: reset sla

* fix: db.get_single_value

* feat: timeline entry for reset sla

* fix: remove communication from support config

* fix: reset sla on split_issue
2019-07-12 12:19:35 +05:30
Suraj Shetty
ca872381a1 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-12 12:13:09 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
Suraj Shetty
32371c8755 feat: Init Pick Ticket and Pick Ticket Item 2019-07-12 11:56:42 +05:30
rohitwaghchaure
9b34eab93a
Merge pull request #18258 from Mangesh-Khairnar/purchase-order-tax-category
feat(purchase-order): Add tax category field in purchase order
2019-07-12 11:39:35 +05:30
Saurabh
acaf76a6de
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 11:10:12 +05:30
Saurabh
98d429d271
Merge pull request #18239 from netchampfaris/breadcrumbs-module-map-2
fix: Add module map for breadcrumbs
2019-07-12 11:09:20 +05:30
Deepesh Garg
abd4a7a950
Merge pull request #18253 from frappe/jigneshpshah-Report-link
fix: navigation link updated for Item Shortage Report
2019-07-11 22:22:54 +05:30
Aditya Hase
f04b19aa2e fix: Company might not have any warehouses when on_update hook for QBM is being executed
This used to throw while renaming a Company that is either used with QuickBooks
Migrator or is set as a Default Company in Global Defaults.
2019-07-11 18:29:24 +05:30
Mangesh-Khairnar
f8c92f30bf feat(purchase-order): Add tax category field in purchase order 2019-07-11 18:27:49 +05:30
Aditya Hase
d4c10801d1 style: Remove multiple whitespace after : 2019-07-11 18:17:01 +05:30
Aditya Hase
7352227a24 fix: Remove unused local variable 2019-07-11 18:16:42 +05:30
Aditya Hase
2f6cd1999a style: One import per line 2019-07-11 18:16:23 +05:30
Aditya Hase
9f40ffcd1e style: Insert whitespace after , 2019-07-11 18:10:05 +05:30
Aditya Hase
dfeb6bef8c style: Remove whitespace before : 2019-07-11 18:08:46 +05:30
Aditya Hase
6bbb726769 fix: Remove unused imports 2019-07-11 18:04:41 +05:30
Nabin Hait
bd055a858c
fix: UX fixes in loan (#18220)
* fix: UX fixes in loan

* Update loan.py
2019-07-11 17:18:00 +05:30
Rushabh Mehta
af88e15e92 fix(patch): set_priority_for_support.py (#18255) 2019-07-11 17:14:29 +05:30
rohitwaghchaure
b390b70ee3 fix: set project in material request when pull items from bom (#18256) 2019-07-11 15:22:03 +05:30
Suraj Shetty
ef1d0d1d14
Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-11 15:02:42 +05:30
Nabin Hait
fca86c48c8
fix: Revert #frappe/erpnext/17896 (#18251) 2019-07-11 14:39:24 +05:30
Jignesh Greycube
870cbad5b2
fix: navigation link updated for Item Shortage Report
Item Shortage Report navigation link was incorrect , hence updated.
2019-07-11 13:56:43 +05:30
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
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
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
rohitwaghchaure
f078031c60 fix: multiple minor issues in delayed order report (#18134) 2019-07-03 11:43:38 +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