Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,180 Commits 3 Branches 0 Tags 1 GiB
a367a85a78
Commit Graph

1576 Commits

Author SHA1 Message Date
Rohit Waghchaure
ab4ff984c4 fix: scan barcode not adding the barcode value in the items table 2019-02-28 13:31:02 +05:30
scmmishra
56ad5da090 fix: Minor Changes 2019-02-27 15:32:36 +05:30
scmmishra
e6735e418f fix: Content navigation 2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1 Fix: Content title fields 2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661 fix: Reloading bug on Content page 2019-02-27 12:24:17 +05:30
scmmishra
23880ae567 fix: Content fetching for articles and videos 2019-02-27 12:09:57 +05:30
scmmishra
628659e02a fix: Routing for course 2019-02-27 12:09:28 +05:30
scmmishra
90b503621b fix: Content Routing 2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287 fix: TopicMeta fixes 2019-02-26 17:11:01 +05:30
scmmishra
03c4c635e0 fix: list title on CoursePage 2019-02-26 16:54:32 +05:30
scmmishra
c011b08699 fix: Fixed UI and API for course page 2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77 fix: Fixed API and UI for topic card 2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849 fix: Minor UI fixes 2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb style: Minor code formatting 2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978 fix: Course Card shows topic list 2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f fix: Route for course page 2019-02-26 16:47:10 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
deepeshgarg007
0d64d622e5 fix: filter only unique values for tree options 2019-02-20 17:55:14 +05:30
scmmishra
62968b318f wip 2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
scmmishra
cb8ef96f6b chore (css): Switched to frappe navbar 2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36 fix (css): Removed container class 2019-02-19 17:01:31 +05:30
scmmishra
765529241e [Major][Breaking] More changes 2019-02-19 13:06:33 +05:30
scmmishra
689500d081 Minor UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0 UI Improvements: Added Custom Navbar 2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d Added quiz card on profile page 2019-02-19 13:06:33 +05:30
scmmishra
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
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes 2018-11-28 08:12:48 +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
Ameya Shenoy
27a0c37963
css: build files in v10 2018-11-15 19:21:30 +00:00
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
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes 2018-10-30 12:48:45 +00:00
Faris Ansari
3df1327b94
fix: Delete button in POS mobile 
Delete button was covered by page-actions container
 2018-10-29 15:15:10 +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