Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,334 Commits 3 Branches 0 Tags 1 GiB
2a9a5352bb
Commit Graph

1723 Commits

Author SHA1 Message Date
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
Suraj Shetty
4177ecb6b2 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-07-22 15:18:03 +05:30
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Suraj Shetty
f5dd494716 fix(call popup): Multiple changes 
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
 standard fields
- Increase timeout to hide popup after the call has been disconnected.
 2019-07-16 11:07:25 +05:30
Deepesh Garg
ce3594796c
Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop 
fix: Address fixes in quotation and opportunity
 2019-07-16 08:42:18 +05:30
rohitwaghchaure
e9f0e88f9b fix: taxes sequence if shipping rule is set in the sales invoice (#18329) 2019-07-15 18:57:25 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
deepeshgarg007
d5fcab5f81 fix: Set taxes fix for lead 2019-07-15 12:44:11 +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
rohitwaghchaure
4870e95b83 fix: po, rate set as zero against the item (#18242) 2019-07-11 10:03:35 +05:30
Suraj Shetty
7837fbe231
style: Add missing semicolon 2019-07-10 19:39:40 +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
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
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
Anurag Mishra
de13faf19a fix: sending sms from quotation 2019-07-09 14:27:20 +05:30
deepeshgarg007
6bb5ade667 fix: Add accounting dimensions to various reports and fixes 2019-07-07 21:24:45 +05:30
karthikeyan5
7fc6021ca5 feat(setup): adding selling buying filter in terms and conditions 2019-07-04 22:46:16 +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
Faris Ansari
a5d975d867 fix: Don't show Send SMS in BOM 2019-07-04 17:47:28 +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
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
Deepesh Garg
78a86af7fd fix: Fiter passing fix in get batch query (#18131) 2019-07-02 10:10:55 +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
Suraj Shetty
502565ff56 fix: Make required changes 2019-07-01 14:28:59 +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
Mangesh-Khairnar
e493490702 fix: mapped doc 2019-06-28 19:22:51 +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
Mangesh-Khairnar
3b60fac3b7 fix: open department in tree view via awesome bar 2019-06-27 11:43:22 +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
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
Suraj Shetty
da629810ad fix: Get accounting dimensions only if user has access 2019-06-20 17:20:19 +05:30
Faris Ansari
357592f55e fix: Remove logo replace logic 2019-06-19 19:17:50 +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
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
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
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
deepeshgarg007
946eefe039 fix: Codacy fixes 2019-06-17 23:10:36 +05:30
deepeshgarg007
dfe006be19 Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes 2019-06-17 15:26:05 +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
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
Faris Ansari
8e99aaf605 fix: Add erpnext website theme import 2019-06-14 20:06:54 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead 
- Remove unused code
- Remove unused import
 2019-06-12 10:31:07 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +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
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
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
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
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor 
refactor: lms
 2019-06-06 16:32:17 +05:30
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
cf270845f2 fix: Indicator toggler 2019-06-05 10:04:51 +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
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
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
Suraj Shetty
893a0c24bb fix: Add call summary 2019-05-31 13:42:22 +05:30
Rohit Waghchaure
4fd704dbb6 fix: POS cash mode of payment css 2019-05-30 23:25:41 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
Shivam Mishra
253a2bd260 refactor: goodbye Vue 👋 2019-05-30 18:54:11 +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
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +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
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
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate (#17712) 2019-05-27 17:15:47 +05:30
Suraj Shetty
bd03a51e8f fix: Handle end call 2019-05-27 15:30:41 +05:30
Suraj Shetty
39a4d59cf6 fix: Call popup modal 2019-05-27 10:38:43 +05:30
deepeshgarg007
e9c6e644f7 fix: Multiple changes in dimension creation logic 2019-05-26 12:34:13 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Suraj Shetty
591ad37894 fix: call popup [wip] 2019-05-24 10:11:48 +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
Suraj Shetty
ee7d6e4598 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-22 14:55:48 +05:30
Suraj Shetty
fb1964aa18 fix: Changes to fix popup 2019-05-22 06:38:25 +05:30
Rushabh Mehta
8c78299158 fix(readme): logo 2019-05-21 11:57:33 +05:30
Suraj Shetty
863b93c32d refator: Rename files and move code 2019-05-21 07:57:06 +05:30
Shivam Mishra
823c79588b feat: Moving to Jinja 2019-05-19 16:01:45 +05:30
Suraj Shetty
8a178d6f30 fix: Update call summary dialog 2019-05-18 16:11:29 +05:30
Suraj Shetty
dd6b70c7cd feat: Show contact on incoming call 2019-05-16 23:55:35 +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
Nabin Hait
3fccfaa7ce feat: Added 'Add Multiple' options in all sales / purchase transactions 2019-05-16 14:54:05 +05:30
Suraj Shetty
03c3bd5f4a feat: Open modal in realtime for incoming call 2019-05-16 13:39:50 +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
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
Shivam Mishra
f82d0a6074 fix: show video duration and publish date only if data exists 2019-05-14 12:02:51 +05:30
Shivam Mishra
2430fd3a4c chore: show description on course card 2019-05-14 11:24:51 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Suraj Shetty
8b0588deaf feat: Init call summary popup 2019-05-02 14:59:44 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount 2019-05-01 12:23:30 +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
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
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
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
Rushabh Mehta
77b82894ff fix(style): buttons in address and contact 2019-04-23 07:57:31 +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
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
Rohit Waghchaure
270d4e9f4e fix: moved erpnext related methods from frappe to erpnext 2019-04-22 14:11:43 +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
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
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
823d89cf66 fix (linting): codacy fixes 2019-04-22 11:46:22 +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
scmmishra
fed4fd0f02 style: linting issue fixed 2019-04-17 15:46:15 +05:30
scmmishra
5522cf8c26 fix: codacy linting 2019-04-17 10:26:21 +05:30
scmmishra
6d3302b0cc style (codacy): code formatting fixes 2019-04-16 18:25:53 +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
61d6b677e4 feat: Show standard serial number selector in item grid form 2019-04-16 15:17:27 +05:30
scmmishra
407496b528 chore: minor changes to labels 2019-04-16 13:32:41 +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
scmmishra
b98612ff5b feat: Added auto fetch logic and button for client 2019-04-16 12:20:42 +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
scmmishra
5b9df676a4 fix: minor bug in breadcrumb routing 2019-04-13 18:53:49 +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
Rushabh Mehta
d625c32ab1 fix(dashboard): for frappe updates, and a new splash logo 2019-04-11 16:13:58 +05:30
scmmishra
bae2d669b5 fix: codacy linting issues 2019-04-09 12:57:56 +05:30