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
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
cbb7c7ff23
ui fixes
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
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
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
babb68d36c
Refactored server side code
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
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
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
708756ed40
Added academy namespace
2019-02-19 13:06:32 +05:30
scmmishra
cc166c01eb
Improved Client implementation
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
b409f7a388
Minor UI Changes and Fixes
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
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
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
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
cd0cab78a5
Quiz UI Working
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
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
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
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
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
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
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
Prateeksha Singh
3423407314
feat(module_links): rearrange links
2019-02-07 09:58:22 +05:30
Faris Ansari
8ae5dbcac8
fix: Set barcode in Item row after scanning barcode ( #16591 )
2019-02-07 07:09:49 +05:30
Sagar Vora
da1dc7fa52
Merge branch 'master' into develop
2019-02-05 18:40:39 +05:30
karthikeyan5
4cb0a250a0
fix(marketplace): bug in filtering menu_items
...
> UX improvment for incomplete feature
2019-02-05 18:07:48 +05:30
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
Nabin Hait
7c0fbfab0a
Merge pull request #16482 from pipech/staging-fixes
...
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
2019-01-29 11:23:05 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation
...
feat: Deprecated In App Help
2019-01-29 11:20:23 +05:30
deepeshgarg007
49cca7ac76
fix: Customer based price_list in online POS
2019-01-25 16:41:01 +05:30
Shivam Mishra
67c338fd51
[fix] Fixed links
...
Previous commit missed the links starting with `http://`
2019-01-25 15:17:44 +05:30
scmmishra
f44dfb1582
[fix] Formatting issues
2019-01-25 14:56:30 +05:30
scmmishra
d71de2a23e
[fix] Code formatting, removed trailing spaces
2019-01-25 14:27:23 +05:30
scmmishra
9731a02657
[feat] Added docsUrl variable to configure help_links
2019-01-25 13:14:11 +05:30
scmmishra
3f9b231f31
[fix] Links now redirect to erpnext.com
2019-01-25 12:56:27 +05:30
pipeCh
c16c7fffb4
fixed for "Select Serial Numbers" dialog won't fill mandatory field
2019-01-24 15:00:07 +07:00
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total
...
fix: Disable rounded total field's value honours docfield's default value
2019-01-22 09:58:06 +05:30
scmmishra
f2d0be7299
[feat] Modified help config
2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3
[feat] Updated all help_links
2019-01-21 19:35:02 +05:30
Nabin Hait
a39f324682
fix: Disable rounded total field's value honours docfield's default value
2019-01-21 18:50:50 +05:30
Aditya Hase
442c85c006
fix(marketplace): Capitalize marketplace factory class to support router changes ( #16428 )
2019-01-18 21:28:37 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Nabin Hait
158e7dcd8b
fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM
2019-01-16 16:00:25 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
Saif Ur Rehman
2689dea72a
fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse
2019-01-09 13:43:06 +05:00
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
deepeshgarg007
8300f5ede7
fix: Codacy issues and added test case
2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Saif Ur Rehman
e414a92d55
fix: Run get_item_tax_info and set_taxes serially
2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
Suraj Shetty
3de12db2b1
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
deepeshgarg007
64238ee91f
(Codacy Fix) Fixed indenttion
2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
Suraj Shetty
5555bf82f8
Capitalize marketplace factory class to support recent router changes ( #16238 )
2018-12-19 10:15:59 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Rohan
159897d88d
fix(customer): Fix Total Unpaid amount in Customer dashboard ( #16234 )
2018-12-18 14:52:23 +05:30
Saurabh
e165fc0e1b
Merge branch 'staging' into develop
2018-12-13 10:45:32 +05:30
Prateeksha Singh
c0f90beb7c
Rename 'Chat' to 'Gitter Chat'
2018-12-12 21:29:55 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
Stavros Anastasiadis
3d82b74ea4
Update Items in Submit state can add new row ( #15644 )
...
* Update Items in Sumbit state can add new row
In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items
* Remove unused code line
* Remove blocking db save thread line
* Remove Company as not standard Field in Purchase Order Item
* Minor indentation fix
* Add Unit Test, add new row in update_child_qty_rate
* Codacy fix
2018-12-10 17:30:55 +05:30
Sagar Vora
4c5bd253a2
fix(party dashboard): empty array is truthy, check for length ( #16184 )
2018-12-10 17:19:10 +05:30
Nabin Hait
3248e0bb3e
Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr
...
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-07 15:20:23 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Nabin Hait
32c95c3292
Merge pull request #16113 from nabinhait/travis-fix
...
fix(test): Fixed tests for discount with margin and period closing voucher
2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-06 07:37:32 +05:30
Rohit Waghchaure
675567419b
[Fix] Permissions issue
2018-12-04 18:43:52 +05:30
deepeshgarg007
c981fb389b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-29 14:57:50 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Nabin Hait
305c8b1fba
Merge pull request #16110 from shreyashah115/fix-timer
...
[Timesheet] Element selector in Timer
2018-11-27 17:57:46 +05:30
Nabin Hait
96598936ad
fix(test): Fixed tests for discount with margin and period closing voucher
2018-11-27 17:48:13 +05:30
deepeshgarg007
c1a3c72b49
final dashboard design
2018-11-27 17:09:12 +05:30
deepeshgarg007
f31caffa74
Changes in get_dashboard_info
2018-11-27 15:04:12 +05:30
deepeshgarg007
6372fbba54
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-27 14:06:58 +05:30
shreyashah115@gmail.com
5281fe8e50
fix: Element selector
2018-11-27 13:11:30 +05:30
Nabin Hait
73e3138a5b
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number
2018-11-26 20:20:22 +05:30
Rohit Waghchaure
b4a5993ece
On uncheck is return field clear the reference field
2018-11-26 20:02:01 +05:30
Saif Ur Rehman
147fa73d3f
Fixed incorrect use of 'this' causing errors calculating rate
2018-11-26 18:14:06 +05:00
deepeshgarg007
a1cffc3490
minor changes in dashboard
2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a
Added colspan to indicators
2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f
Customer/Supplier dashboard fix for multi company setup
2018-11-23 10:17:28 +05:30
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Nabin Hait
367a076fa4
fix(discount): Fixed item discount amount calculation
2018-11-13 18:41:58 +05:30
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Doridel Cahanap
2b14d6a058
Contract Manufacturing : Customer Provided Items ( #15828 )
...
* Material Request from Production Plan for Customer provided parts
* Test cases
* Customer web portal for their material requests
2018-11-13 12:07:16 +05:30
Zarrar
6922415d1b
[New Feature]Scan Item Barcode label to quick create/update records in items child table ( #15731 )
...
* Update transaction.js
* setup barcode scan
stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js
* fix bug of item_code change always reset qty to 0
when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* clean up barcode logic for transactions
* call scan_barcode method for stock entry
* separate out logic for searching serial, batch or barcode number
* added scan barcode field in transactions doctype
* search barcode-serial-batch sequence, code rectify
* hide all barcode related field if disabled from settings
* remove print statement
* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Faris Ansari
bbc1cb274e
Merge pull request #15911 from netchampfaris/marketplace-fixes-3
...
Hub fixes
2018-11-05 19:19:44 +05:30
Faris Ansari
d6b664f7ee
fix(hub): Prevent registered actions
2018-11-05 19:18:48 +05:30
Faris Ansari
0d08da50c6
fix: Refresh PageContainer component based on current route
2018-11-05 15:47:26 +05:30
Faris Ansari
68dbf7f99c
fix: Use frappe.utils.make_event_emitter
2018-11-02 13:30:51 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
ca66c7ba14
Merge branch 'master' into staging-fixes
2018-10-23 08:01:13 +00:00
Rohit Waghchaure
55416e08f1
[Fix] Marketplace setting permission error
2018-10-23 11:52:06 +05:30
Rohit Waghchaure
aef7a6ec44
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-22 13:51:32 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
Saif
3c9155e406
[Minor Fix] Force toggle display Net Total field when default taxes are fetched ( #15532 )
...
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched
* Prevent net_rate from becoming NaN
* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
Ameya Shenoy
f5d3ce8846
Merge branch 'staging' into develop
2018-10-08 09:44:34 +00:00
Shreya Shah
4fb9230d16
Add missing method link_to_mrs to buying.js ( #15613 )
2018-10-08 14:18:03 +05:30
Shreya Shah
95d93913ce
fix(link_to_mr): Add missing method to buying.js ( #15616 )
2018-10-08 14:17:37 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
Faris Ansari
e0a148474d
fix: Translation string ( #15561 )
2018-10-03 10:37:41 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Faris Ansari
6575e52942
fix: Refactor Review Area according to new Text Editor ( #15536 )
...
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
Faris Ansari
7a8c5b0c2c
fix(setup wizard): Validate FY dates ( #15473 )
2018-09-25 18:34:33 +05:30
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Faris Ansari
aa856c474a
fix(setup wizard): Validate FY dates ( #15419 )
...
- start date should be less than end date
2018-09-18 10:42:04 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Faris Ansari
76b31deda5
Isomorphic marketplace ( #15384 )
...
* feat: Make marketplace run on hub server in Guest mode
* fix: Skip page actions on server
* fix: Limit PageContainer to marketplace route
* fix(eslint): Add hub variable to globals
2018-09-11 17:38:31 +05:30
Faris Ansari
9fb5e1c61b
fix(image): New Image component to consistently handle broken images
...
- psuedo element hack didn't work cross browser
2018-09-07 23:17:29 +05:30
Nabin Hait
b479a87031
fix(report): Cost center filters in financial statements and general ledger
2018-09-07 13:17:23 +05:30
Sanjay Kumar
1b49f3a4e7
Allow cost center in entry of balance sheet accounts ( #14972 )
...
* Allow Cost Center In Entry of Balance Sheet Account
* Add parent cost center in get payment entry
* Add Tests for Allow Cost Center In Entry of Balance Sheet Account
* Add tests for cost center wise account and party balance
* set parent cost center in taxes
* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents
* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year ( #15320 )
2018-09-05 17:18:59 +05:30
Prateeksha Singh
8a160684b7
[fix] filter() result in list
2018-09-04 10:59:20 +05:30
Faris Ansari
7be9c381d8
fix: Revert skeleton in Sidebar
...
- sidebar items repeating for some reason
2018-09-04 00:12:47 +05:30
Faris Ansari
66321e6af7
feat: Add skeleton to Home and Sidebar
2018-09-03 19:39:19 +05:30
Prateeksha Singh
1265a26c0c
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d
[hub] update settings after publish, fix route_map
2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de
[hub] hide Contact Seller and Save Item in read-only
2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016
fix: Selling Messages
2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d
[hub] show become a seller button to all, but not dialog
2018-09-03 17:31:43 +05:30
Faris Ansari
d4bba297c2
fix: Container title
2018-09-03 17:12:22 +05:30
Faris Ansari
28652baacc
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e
fix: email in profile dialog
2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17
[fix] add message for admin users before register dialog
...
- use is_registered api for page routes
2018-09-03 16:39:59 +05:30
Faris Ansari
ad0be6aaa2
fix: Messages
...
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109
[marketplace] Disallow unregistered routes if not registered
2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85
[hub] ask company description in dialog
2018-09-03 13:11:23 +05:30
Prateeksha Singh
85563ddfd3
[hub] update publish hub api
2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06
[hub][api] Update save and view api to be user specific
2018-09-03 02:25:41 +05:30
Faris Ansari
68129df74c
feat: Add add_user dialog and methods
...
- wip
2018-09-02 18:29:00 +05:30
Prateeksha Singh
b2b745fc7a
[hub] simplify marketplace settings, remove company fields
...
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d
feat: Add new registration flow
2018-09-01 14:30:46 +05:30
Prateeksha Singh
4e1fd0b417
[hub] register_seller -> register_marketplace
...
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
2018-09-01 09:55:43 +05:30
Prateeksha Singh
a8065ff725
[hub] move register_seller to api, remove old code
2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1
[hub] set first user's password in marketplace users
2018-08-31 20:42:48 +05:30
Prateeksha Singh
ea2b9cbd1c
[hub] add user selection in register
2018-08-31 17:56:50 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3
...
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:52:26 +05:30
Faris Ansari
f9a66c1c36
fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:30:34 +05:30
Faris Ansari
25f509ebd3
feat: Add disable marketplace option in Hub Settings
2018-08-31 15:35:32 +05:30
Faris Ansari
91ac26c2ff
fix(seller dialog): Email should be session user email ( #15270 )
2018-08-30 19:19:57 +05:30
Rushabh Mehta
49f9747385
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc ( #15267 )
...
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
2018-08-30 18:50:48 +05:30
Nabin Hait
f6b784e39e
Test fixes
2018-08-30 18:42:35 +05:30
Prateeksha Singh
ecad873d19
[hub] remove item.js, fix seller decription condition
2018-08-30 16:21:26 +05:30
Prateeksha Singh
5797565dd0
Merge with upstream
2018-08-30 16:15:27 +05:30
Prateeksha Singh
ff52e93e69
[hub] Merge conflicts
2018-08-30 16:11:41 +05:30
Prateeksha Singh
997bfa4916
[hub] add review timeline element
2018-08-30 16:08:52 +05:30
Faris Ansari
f3034ae262
feat: Add Report Item dialog
2018-08-30 16:05:15 +05:30
Faris Ansari
8e04487253
fix: Rename 'Product' to 'Item'
2018-08-30 15:35:17 +05:30
Prateeksha Singh
dc36d52ef9
[hub] fix review send
2018-08-30 15:12:18 +05:30
Faris Ansari
6b695d32b2
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-30 14:36:14 +05:30
Faris Ansari
90265aec24
fix: Page container routing
2018-08-30 14:36:05 +05:30
Faris Ansari
062cd62484
fix: Add restrictions for session user who is not hub seller
2018-08-30 14:35:56 +05:30
Prateeksha Singh
bff2bdc858
[hub] UI and empty state in 'your products' to guide on publishing
2018-08-30 12:58:46 +05:30
Prateeksha Singh
47f5f0e608
[hub] remove See All from non expandable sections
2018-08-30 12:16:08 +05:30
Prateeksha Singh
b20c4e3184
[hub] remove client hub_settings scripts
...
- multiline to single line messages to translate
2018-08-30 12:01:04 +05:30
Prateeksha Singh
04d051bb73
[hub] add review area
2018-08-30 02:42:13 +05:30
Faris Ansari
ff8f1c6120
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416
fix: Only a System Manager can register as a seller
...
- every other user has read only access
2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6
[hub] fix code lint issues, styles
2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Faris Ansari
8bc954ecc6
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 18:29:08 +05:30
Faris Ansari
b26381e6b8
fix: Scroll to top when route changes
2018-08-28 18:29:01 +05:30
Prateeksha Singh
bd7d964848
[hub] Merge Develop
2018-08-28 18:25:07 +05:30
Prateeksha Singh
2d45373f33
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 17:25:01 +05:30
Prateeksha Singh
1e02f00075
[hub] record views, update favourite api
2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97
fix: Show empty state if there are no items
2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 17:17:36 +05:30
Faris Ansari
5689494f9c
chore: Remove old messages page
2018-08-28 16:52:17 +05:30
Suraj Shetty
b92403fbed
Add 'Become Seller' as a primary key
...
- Also remove some unwanted code
2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b
Remove 'Become Seller' option from sidebar
2018-08-28 15:03:01 +05:30
Suraj Shetty
ec12b34a79
Add margin below publish area
2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e
Add strip html filter
2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548
fix: Add empty state in Selling
2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9
feat: Selling Page
...
- common Messages page for both buying and selling
2018-08-27 19:51:36 +05:30
Prateeksha Singh
bc859cbf1d
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f
[hub] merge conflicts
2018-08-27 15:16:19 +05:30
Suraj Shetty
dc7e8e6a26
Replace hub_item_code -> hub_item_name
2018-08-27 14:11:48 +05:30
Maxwell Morais
a2c1d92374
Revert "Fix shipping_address for DropShipping" ( #15218 )
...
* Revert "Cleaned up welcome email code (#15175 )"
This reverts commit 771fbb8f01#15187 )"
This reverts commit 2b72d09948#15184 )"
This reverts commit c5cf428d00#15206 )"
This reverts commit 2b2712bb9e8fe8d1758a#15203 )"
This reverts commit fbc3df3247#15202 )"
This reverts commit 4a394bcbf4
2018-08-27 12:05:41 +05:30
Prateeksha Singh
fa26899cd0
[hub] added DetailHeaderItem to detail pages, contact seller button
2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda
[hub] Register components, init Item Page
...
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7
feat: Sidebar in vue
2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e
fix: Add back link to Buying
2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69
chore: Remove old messages files
2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9
feat: Buying and BuyingMessages in vue
2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940
feat: Add helper directives
...
- v-route
automatically route to a valid frappe route
- v-img-src
handle img loading and error handling
2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823
feat: SectionHeader component
2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd
fix(search-input): submit on enter
2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27
feat: Add dynamic routes in PageContainer
2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94
[hub][vue] add action object in empty state, make NotFound page
2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5
[hub][vue] add skeleton state to DetailView
2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda
[hub][vue] Seller Page
2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86
[hub][vue] DetailView and Profile page
2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff
feat: Add PageContainer
2018-08-26 12:41:02 +05:30
Suraj Shetty
0e59ec3ed2
Update messages UI
2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9
Separate links for selling and buying messages
...
- Add separate UI for selling messages
- Remove some redundant code messages
2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543
[hub][vue] Home page, add section title in item key in v-for
2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9
[hub][vue] search page
2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b
[hub][vue] Category and Published Products pages
2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013
[hub][vue] replace page files, fix item 'seen' prop
2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e
[hub][vue] Saved Products Page, remote item card
...
- also undo unfavouriting items
2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974
[hub][vue] add import
2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a
[hub][vue] Publish Page
2018-08-24 16:38:34 +05:30
Prateeksha Singh
67e0374261
[hub] add data-driven notification message
2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d
[hub][vue] add empty state and dynamic publish button
2018-08-23 21:25:53 +05:30
Prateeksha Singh
d7d2bb261b
[hub] add SearchInput
2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845
[hub][vue] init item card container in vue
2018-08-23 12:22:20 +05:30
Maxwell Morais
4a394bcbf4
Fix shipping_address for DropShipping ( #15202 )
...
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.
To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
2018-08-23 11:08:37 +05:30
Suraj Shetty
341386e3a7
Add list view for messages
2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc
Add recent message block to item_card
2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1
Remove unused message to avoid confusion
2018-08-22 16:44:55 +05:30
Suraj Shetty
7ee79498fc
Hide review option for unregistered user
2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101
Stop event bubbling on clicking edit item
2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11
Fix publish button alignment
2018-08-22 11:50:23 +05:30
Suraj Shetty
7a040c4dd8
Show favorite button only for registered user
2018-08-22 11:32:49 +05:30
Faris Ansari
e745e85d98
feat: route to message room page after contact seller dialog
2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6
fix: remove items with invalid image
2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17
Merge with upstream
2018-08-21 19:17:25 +05:30
Faris Ansari
ff189b6853
fix: publish items
...
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
2018-08-21 19:14:44 +05:30
Faris Ansari
d29a3b3567
Highlight links with part route or full route
2018-08-21 19:12:10 +05:30
Prateeksha Singh
b0a3a106fc
[hub] profile email uneditable, style additions, base64 sync enable
2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719
Add BuyingMessages page
2018-08-20 18:33:46 +05:30
Faris Ansari
8de6380648
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771
[hub] response data in hub call event trigger
2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de
[hub] emit hub call event to set category options while publishing
2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007
[feat] new component: ItemPublishDialog
2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011
[feat] new component: NotificationMessage
2018-08-20 13:07:23 +05:30
Prateeksha Singh
42be665412
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d
[hub][feat] stateful publishing area
2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60
[hub][feat] Edit your Profile, recycle profile dialog
2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1
[hub] Register in a dialog instead of Page
...
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
2018-08-20 00:25:26 +05:30
Prateeksha Singh
a525d12f69
[hub] sync multiple image urls
...
- using a simple multiselect currently
2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96
[hub] Publishing Dialog, Sync category
...
- Hub Category selection
- Recycled
2018-08-19 19:39:00 +05:30
Faris Ansari
2ce2e1b6b0
feat(messages): split messages into buying and selling
...
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f
feat: custom cache invalidation for hub calls
...
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7
feat: empty states for favourites and search page
2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439
refactor: rename hub-card-container to hub-items-container
2018-08-17 14:29:22 +05:30
Rushabh Mehta
8705371ef0
fix(product-listing): fix variant selection in website
2018-08-16 09:22:45 +05:30
Prateeksha Singh
460e2798cd
[hub] Favourites UI
...
- remove from listing
- add to favourites
2018-08-14 11:42:40 +05:30
Shreya Shah
0631aed3d9
Discount amount field in all transactions' child tables ( #15124 )
...
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
2018-08-14 10:51:48 +05:30
Prateeksha Singh
1a0fb5b63a
Add detail page favourited state
2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785
[refactor][major] Separate out Components
...
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
2018-08-13 21:36:07 +05:30
Saurabh
20fb443f0c
[Resolved] merge conflicts
2018-08-10 17:11:30 +05:30
Prateeksha Singh
b777f3dbfd
[layout][iterate] item detail page actions
2018-08-10 10:38:28 +05:30
rohitwaghchaure
8356d4b892
[Fix] disable_rounded_total not found error ( #15113 )
2018-08-09 15:51:11 +05:30
Saurabh
824b388631
Resolved merge conflicts
2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c
[hub][fix] Category page api call
2018-08-07 12:56:56 +05:30
Prateeksha Singh
318cca8cae
[hub] Add 'See All' for Category items
...
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622
Add Products by Seller
2018-08-07 12:02:14 +05:30
Prateeksha Singh
658d1bbae2
Fix product header styles
2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4
Home: Category-wise Items
2018-08-06 18:31:26 +05:30
Prateeksha Singh
a5f6e54b70
fix merge conflict
2018-08-06 13:56:53 +05:30
Prateeksha Singh
106856b1ab
Show View count on items
2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651
[hub] Company (Seller) page
2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6
Messages: first cut
2018-08-01 19:19:53 +05:30
rohitwaghchaure
ae4ff5a403
[Fix] In words showing grand total instead of rounded total ( #15065 )
2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b
Get Advances and auto allocate ( #14970 )
2018-08-01 18:07:39 +05:30
Zarrar
7f8024c516
[Enhancement] Tax Withholding Category ( #15064 )
...
* add single, cumulative threshold, remove checkboxes
* remove tds child table from supplier & add tds link field
* add description field in tax withholding category
* add tax withholding data for indian setup, some fixes
* add a checkbox for tax withholding in purchase invoice
* remove supplier's child table for tds
* enable tds field if supplier has tds set inits master
* move rates data to child table - adding fiscal year support
* change bootstrap data according to child table config of tds
* show category name in list view
* loyalty program fixes
* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry
* add fiscal year dependency in company test
* minor loyalty program fix
* minor tier calculation fix
* minor handling duplicate exception
* toggle apply_tds according to supplier, code rectify
* minor fixes for loyalty program
* test case for single and cumulative threshold
* codacy fix
2018-08-01 17:45:05 +05:30
Nabin Hait
e45ec661ea
Additional fields in Item Price ( #14540 )
...
* [IMPROVEMENT] Item Price New Fields and Features
* [IMPROVEMENT] Item Price
- Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
- Stock Setting to accept Default Price List for Purchase or Sales Item
- Move Item Section in Item Price
* Fetch default Item Price based on Customer as null
* test fixes
* Code cleanup and fixed the issue of incorrect item price fetched against the customer
* Removed min qty from packing_increment calculation
* Removed auto_update_price_list_rate from the stock settings
* Revert sales_order.json changes
* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings
* Removed unnecessory file
* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f
[hub] make get_items generic, add legacy.py
2018-08-01 17:32:13 +05:30
Prateeksha Singh
b4e9ec33cb
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6
[restructure] make api.py
2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27
Prevent access of registered routes
2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed
Add generic action handler to subpage
2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383
Rename base_page to subpage
2018-08-01 15:57:13 +05:30
Faris Ansari
fbe9a46d51
Add Marketplace link to user dropdown in toolbar
2018-08-01 15:56:39 +05:30
Faris Ansari
709a4a3f4e
Break marketplace.js into multiple files
2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e
Item Menu dropdown
2018-08-01 13:35:32 +05:30
Faris Ansari
057839298c
fix get_category call
2018-07-31 19:06:11 +05:30
Faris Ansari
300c07c3d9
Use hub.call for categories and favourites
2018-07-31 18:02:13 +05:30
