1941 Commits

Author	SHA1	Message	Date
Rohan Bansal	90972cfbf9	fix(transaction): Avoid shipping rule charge override by tax template	2019-03-11 15:00:48 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
rohitwaghchaure	d4754619d0	Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table ... fix: scan barcode not adding the barcode value in the items table	2019-03-07 11:29:56 +05:30
scmmishra	18a1a8d4f4	style: Fixed route.js	2019-03-06 10:55:21 +05:30
Frappe Bot	8f0660ab31	Merge branch 'master' into develop	2019-03-01 09:22:36 +00:00
scmmishra	471140c6d4	fix: Minor changes	2019-02-28 18:14:25 +05:30
scmmishra	f0a56b977a	feat: Minor fixes to profile page	2019-02-28 18:11:46 +05:30
scmmishra	ab8fc8c2bf	feat: Quizzes fixed	2019-02-28 16:42:37 +05:30
scmmishra	b793cc8e1e	fix: Minor changes	2019-02-28 16:33:38 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
scmmishra	5e61b17cf8	fix: Routing after finishing a course topic	2019-02-28 15:43:33 +05:30
scmmishra	de5f71ae9e	fix: Showing Topic Progress	2019-02-28 15:40:49 +05:30
scmmishra	b17d289bda	fix: Course card progress	2019-02-28 15:21:43 +05:30
Rohit Waghchaure	ab4ff984c4	fix: scan barcode not adding the barcode value in the items table	2019-02-28 13:31:02 +05:30
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
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. * Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)" This reverts commit 2b72d09948. * Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)" This reverts commit c5cf428d00. * Revert "[Minor] Create default department on country setup (#15206)" This reverts commit 2b2712bb9e. * Revert "Permissions issue in BOM tree" This reverts commit 8fe8d1758a. * Revert "Fix indentation accounts_receivable.py (#15203)" This reverts commit fbc3df3247. * Revert "Fix shipping_address for DropShipping (#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
Faris Ansari	b1d6f94cdf	Merge branch 'hub-redesign' into hub-redesign-contact-seller	2018-07-31 14:54:58 +05:30
Faris Ansari	2ae80fd000	wip	2018-07-31 12:02:20 +05:30
Prateeksha Singh	425356c21c	[hub] remove test code	2018-07-31 10:45:53 +05:30
Prateeksha Singh	46df72d55d	[hub] test progress trigger	2018-07-30 13:24:01 +05:30
Prateeksha Singh	efbd2ee3f5	[hub] Realtime Sync Progress ... - Show progress from the migration plan - Show products being synced - Disallow publishing in sync state	2018-07-30 09:17:14 +05:30
Prateeksha Singh	811cc3f78f	[hub] resolve merge conflicts	2018-07-29 18:05:07 +05:30
Prateeksha Singh	d27b27f88a	Hub Seller Profile and Timeline ... - profile details fetched from server - timeline updates on publishing items	2018-07-29 16:52:16 +05:30
Prateeksha Singh	6f05ea124e	[hub] Track Hub Sync on the Server ... - Create a Hub Seller activity on start of Hub Sync - Store its name as remote_id in the Run - Update that activity remotely once the Run here is complete, status	2018-07-29 14:40:52 +05:30
Faris Ansari	296848cb69	Publish Page ... - Code cleanup - Separate local item card and hub item card - Use make_search_bar	2018-07-28 16:14:22 +05:30
Prateeksha Singh	d0a1a4fe90	[hub] differentiate self-published items	2018-07-28 13:16:09 +05:30
Prateeksha Singh	f6f429fb10	[hub] Item page skeleton	2018-07-28 12:25:14 +05:30
Prateeksha Singh	dd8045759f	[hub] Published Products Page	2018-07-28 01:54:51 +05:30
Faris Ansari	19d40cafba	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-27 21:51:31 +05:30
Faris Ansari	b7a63ab81e	Homepage ... - show random items from each hub seller - show items from country - move add_review method on hub	2018-07-27 21:51:26 +05:30
Prateeksha Singh	f4fbf5215b	[hub][search] empty search and route fallback	2018-07-27 21:07:56 +05:30
Faris Ansari	44f7d2e62b	SearchPage	2018-07-27 15:33:00 +05:30
Faris Ansari	24d5f17255	NotFound page for marketplace	2018-07-26 19:22:58 +05:30
Faris Ansari	b5ce1976b8	Move marketplace code back to marketplace.js	2018-07-26 18:46:38 +05:30
Faris Ansari	521fe4d01d	Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign	2018-07-26 18:39:34 +05:30
Faris Ansari	cae856cbda	Add marketplace back to hub_listing	2018-07-26 18:39:28 +05:30
Faris Ansari	f4884f8108	Marketplace ... - Cache hub calls - call_hub_method using FrappeClient connection - Become a seller UX fixes	2018-07-26 18:37:01 +05:30
Faris Ansari	2ca5afa214	Move marketplace ui to marketplace.js	2018-07-26 18:35:04 +05:30
Prateeksha Singh	d450c0ac08	[hub][publish] in_progress/empty state	2018-07-26 17:24:33 +05:30
Prateeksha Singh	b750425288	[hub] sync in progress	2018-07-26 16:25:22 +05:30
Prateeksha Singh	d1224ca662	[hub][init] add profile page	2018-07-26 13:39:06 +05:30
Prateeksha Singh	f26177bdbc	[hub] setup publish items flow	2018-07-26 10:38:11 +05:30
Prateeksha Singh	1d1696080e	[hub][publish] add search, fix multiple append	2018-07-26 08:36:33 +05:30
Prateeksha Singh	505f6f14e9	[hub][publish] select/deselect all items	2018-07-26 08:06:21 +05:30
Prateeksha Singh	9685d7c37a	[hub] registered vs read-only views	2018-07-26 01:12:00 +05:30
Prateeksha Singh	cf2d2a5c75	[hub][init] add publish items page	2018-07-25 20:02:12 +05:30
Faris Ansari	6b07898ef0	semicolon	2018-07-25 17:07:26 +05:30
Faris Ansari	ed1190126e	Fix Syntax Error in hub_factory.js	2018-07-25 16:51:01 +05:30
Prateeksha Singh	bc8caefc19	[hub] add register as a seller page	2018-07-25 11:08:23 +05:30
Faris Ansari	0fbaa72504	Add review area	2018-07-25 00:49:11 +05:30
Zlash65	617532b2cb	Factory: class.extend -> es6 class	2018-07-24 14:20:10 +05:30
Faris Ansari	ea2d1b0a19	New page: marketplace ... - subpages: home, favourites, item, category	2018-07-23 18:44:46 +05:30
Prateeksha Singh	ebb5662cb7	[revert] modules dropdown	2018-07-23 17:04:34 +05:30
Faris Ansari	f585197045	Cleanup homepage	2018-07-23 11:55:07 +05:30
Faris Ansari	789ad180ea	Merge pull request #14969 from netchampfaris/financial-statement-reports ... Financial Reports fixes	2018-07-21 12:28:31 +05:30
Prateeksha Singh	abca510f9a	Update conf.js	2018-07-20 16:07:50 +05:30
Faris Ansari	5986d59b01	Financial Reports ... - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	8395a7ad6f	Modifications in last purchase rate button (#14948) ... * Make last purchase rate button visible until submitted * Move buttons - Get last purchase rate and link to material request buttons moved to toolbar under Tools button * Remove disable fetch last rate functionality * Make last purchase rate field read_only	2018-07-18 12:27:27 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935) ... * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
Nabin Hait	26786bd35d	minor route fix for general ledger	2018-07-17 15:59:15 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867) ... * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631) ... * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
Zarrar	c1225a84cc	fix css for coa dialog in setup wizard (#14793)	2018-07-03 10:35:31 +05:30
Ranjith Kurungadam	a10f118ddd	Payroll Entry - Validate Attendance (#14738)	2018-06-28 23:28:07 +05:30
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706) ... * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
Zarrar	254ce645b1	[ Enhance ] Setup Wizard - Chart of Accounts (#14698) ... * enable selection of coa for user Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart * read chart from file and make a tree render-able dict of it * tree method to return node data for coa setup wizard	2018-06-28 14:15:34 +05:30
Prateeksha Singh	5d227c9028	Revert "[hub] add link in modules"	2018-06-28 09:59:46 +05:30
Prateeksha Singh	84d358bd0a	Merge pull request #14708 from pratu16x7/hub-fixes ... [hub] add link in modules	2018-06-28 03:23:03 +05:30
Prateeksha Singh	2e0b5140e7	[hub] add link in modules	2018-06-28 03:17:39 +05:30
Rushabh Mehta	096b943b0c	[minor] fixes to moment.defaultDateFormat and daily work summary eplies	2018-06-25 22:38:20 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604) ... * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620) ... * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Charles-Henri Decultot	fc2292f08c	Email alert renamed to Notification (#14618)	2018-06-21 09:17:52 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Nabin Hait	875c941f3d	fixes in setting itemised tax breakup	2018-06-18 17:41:27 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order ... - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501) ... * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
Prateeksha Singh	00ab78d768	[hub] set page title dynamically	2018-06-07 14:13:00 +05:30
Prateeksha Singh	9a7f957ace	[hub] fix item page recursion	2018-06-07 12:40:40 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Sushant Nadkar	64907e5083	Validate response message for frappe call (#14343)	2018-06-05 10:33:04 +05:30
rohitwaghchaure	5ecc26bf15	[Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328)	2018-06-04 11:00:24 +05:30
Prateeksha Singh	8ac7dfee36	Merge pull request #14329 from pratu16x7/hub-fixes ... [hub][minor] remove links #14309	2018-06-04 10:28:47 +05:30
Prateeksha Singh	e73df88863	[hub][minor] remove links #14309	2018-06-04 10:26:49 +05:30
rohitwaghchaure	780952ea03	Show actual qty in warehouse link search (#14258)	2018-05-31 09:29:18 +05:30
Prateeksha Singh	09e46a4e5f	Hub fixes (#14281) ... * [hub] remove list freeze * [hub] fix svg in icon * [hub] implement route options in hub list view	2018-05-30 15:12:20 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114) ... * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
Valmik Jangla	b52d5b21a1	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
Doridel Cahanap	e42192bb6c	[WIP] Alternative items (#13705) ... * Alternative Items in BOM * Alternative Items in Work Order	2018-05-16 10:58:39 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po ... [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate ... [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters ... Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Shreya	0db85067b2	Add For Buying and For Selling checkboxes in Currency Exchange	2018-05-15 12:48:10 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Faris Ansari	404f39d373	[fix] apply price list ... in_apply_price_list flag remains true if server exception occurs	2018-05-14 15:46:45 +05:30
Zlash65	2e0809801d	controller and other changes	2018-05-14 11:45:38 +05:30
Nabin Hait	b9fed2aa38	Removed company from Finance Book and related changes	2018-05-09 15:10:29 +05:30
Gaurav Naik	8cbbdfdf30	Added finance book filter to financial_statements.js	2018-05-09 15:03:05 +05:30
Shreya Shah	204c3bc37e	Remove Production Planning Tool docs (#13946) ... * Remove Production Planning Tool docs * Remove Offer Letter Occurrences * Rename Employee Loan Occurrences	2018-05-07 18:21:03 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Nabin Hait	ed376cacc8	Set Qty in transactions based on serial no via Stock Settings (#13897)	2018-05-03 16:24:52 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking ... Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
rohitwaghchaure	0065624fe0	Tax amount showing under wrong tax header in the report (#13843)	2018-05-02 12:20:55 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Prateeksha Singh	420c79041e	[fix] company listing context	2018-04-05 14:44:16 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Prateeksha Singh	b60a52b194	Hub Market (#13325) ... * [hub] enable hub with OAuth token from user's client ID * [hub] settings schema for adding users * [hub] image view style listing * [hub] broken image link fallback * [wip] * [hub] bootstrap timeline * [hub] setup quick view * [hub] reformat ratings, add companies autocomplete filter * [hub] common listing frames * [hub] setup sort selector * [hub] timeline * [hub] customize list header * [hub] genuine form fieldtypes * [hub] review products * [hub] suggest missing categories remotely * [hub] Wishlist; header and title templates * [hub] link wishlist, remove company migration * [hub] calculate ratings	2018-04-03 10:44:13 +05:30
Charles-Henri Decultot	6860036b01	Agriculture module corrections (#13438) ... * Agriculture module corrections * Update ternary_plot.js	2018-04-02 10:51:53 +05:30
Shreya Shah	5d71609f0b	Timer fixes (#13443) ... * alert for exceeded time only when dialog is open * fetch row having an activity without from_time * fixes if timesheet created from work order * reset timer limit exceeded	2018-04-02 10:32:39 +05:30
Manas Solanki	a7f5589564	fix for the update button in the sales invoice (#13435)	2018-04-02 10:32:00 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +05:30
Ameya Shenoy	c5d222253a	Permisssion fixes for child table ... Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3 frappe.client.[get_list, get, get_value] when called on child table needs parent as an argument or it throws an error by default	2018-03-29 13:16:08 +05:30
rohitwaghchaure	68ba4fd697	[Fix] Multi-batch selection issue in POS (#13407)	2018-03-28 12:33:15 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121) ... * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Zarrar	7f4cd3f5ea	Update Docs for Work Order (#13403) ... * update docs * rename files, update pngs * update pngs for timesheet, leftover changes	2018-03-27 14:59:49 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Shreya Shah	149f7ee875	[Fix] General Ledger Report (#13374) ... * error fix if party_type = student or shareholder * clear party filter when party_type changes to avoid error throw * dict with values of party_name in utils.js * fetch party_name from erpnext.utils.get_party_name * Update general_ledger.py	2018-03-27 11:29:25 +05:30
Shreya	8bb0f05451	added task field	2018-03-23 11:46:45 +05:30
Shreya	822ba21f38	codacy fix	2018-03-23 11:41:56 +05:30
Shreya	559011404a	removed timesheet.html, appended it as a helper function	2018-03-23 11:41:56 +05:30
Shreya	5bf24be704	minor fixes	2018-03-23 11:41:56 +05:30
Shreya	8f06266838	all fields editable	2018-03-23 11:41:55 +05:30
Shreya	68ec22a90c	moved timer.js to public/js	2018-03-23 11:41:55 +05:30
rohitwaghchaure	6a2d073fe1	Merge pull request #13353 from PawanMeh/fixes_13352 ... Add total qty to offline POS	2018-03-22 11:36:32 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344)	2018-03-22 11:12:02 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902) ... * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	c3889d85a1	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233)	2018-03-08 16:21:13 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988) ... * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Faris Ansari	7c744acc49	Changes for Rollup (#12924) ... * Changes for rollup * remove variables.less	2018-02-20 14:21:50 +05:30
Jay Parikh	33b2614377	[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966)	2018-02-16 14:45:40 +05:30
Zarrar	441a1e1b8a	Validate Bank name in Setup wizard on the same slide (#12968) ... * validate bank name before moving on to next slide * Update setup_wizard.js	2018-02-16 14:44:42 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913) ... * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
Shreya Shah	8b531c1ee6	Fix parenthesis in buying controller (#12923)	2018-02-15 11:21:49 +05:30
Prateeksha Singh	387a242232	Merge pull request #12928 from pratu16x7/hub-pages ... Hub pages	2018-02-15 11:05:22 +05:30
Prateeksha Singh	9889899603	[hub] cleanups	2018-02-15 10:54:23 +05:30
Prateeksha Singh	1ad072f2a9	[hub] cleanups	2018-02-15 10:47:59 +05:30
Prateeksha Singh	2073959bb8	Update entity properties	2018-02-15 10:24:16 +05:30
Prateeksha Singh	6ee035ba5b	tree parent working	2018-02-15 08:50:31 +05:30
Prateeksha Singh	25d5a1d890	add company pages	2018-02-14 19:53:18 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900) ... * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
rohitwaghchaure	8e675ebbe2	[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898)	2018-02-13 17:11:06 +05:30
tundebabzy	6e90f49a35	Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714) ... * unconditionally fetch exchange rate * Revert "unconditionally fetch exchange rate" This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a. * allow for `plc_conversion_rate` field to be reset * fetch exchange rate using price list currency and company currency not form currency * clean up	2018-02-12 15:18:57 +05:30
tundebabzy	c89782502c	Report presentation currency (#12670) ... * Add new Select to filters * get the currencies from database rather than hardcoded * label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency * add new function - get_currency * tweak new function `get_currency` * add new function `convert` to convert a value to another currency * add new function `convert_to_presentation_currency` * clean up `get_currency` first pass * memoise the exchange rates * limit fetched GL entries to to_date * check if account type is p&l or not and use appropriate exchange rate based on that * change EXCHANGE RATE to a dict, use for memoisation * rename EXCHANGE_RATE * cache exchange rates and use them as needed * add docstrings * add presentation currency logic to financial statement reports * move new functions from `general_ledger.py` to new module * clean up * PEP 8 clean up * move function to util.py * PEP 8 clean up * remove presentation currency option from cashflow * adjust currency as needed * allow users to save presentation currency in Accounts Settings * add new function `get_presentation_currency_list` * refactor query_report modules with no promises * Revert "allow users to save presentation currency in Accounts Settings" This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b. * show print page in correct currency * Update utils.py	2018-02-12 15:04:50 +05:30
sivankar	621740efd9	Enhancement and bug fix in batch (#12753) ... * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Faris Ansari	f7717b9ec2	get_party_account only if company is set	2018-02-08 11:11:21 +05:30
Prateeksha Singh	152bf37e7f	Merge pull request #12813 from pratu16x7/hub-fixes ... Hub listing and entity page	2018-02-08 10:47:16 +05:30
Prateeksha Singh	4413ce1be1	company page, deprecate custom page	2018-02-07 23:50:01 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Rohit Waghchaure	e8d22bb999	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
Prateeksha Singh	3eaccffbd9	[hub] items searchable via core filters	2018-02-05 12:58:30 +05:30
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Faris Ansari	9b64620bc0	[hub] hub page using BaseList	2018-02-05 12:57:49 +05:30
rohitwaghchaure	441032d39c	Merge branch 'develop' into develop	2018-02-01 16:54:10 +05:30
Cesar	d8b1927e8d	Allow no ZERO Payment ... Allow no ZERO Payment	2018-01-29 15:39:52 +01:00
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
rohitwaghchaure	52beb77539	Don't validate payment terms for POS (#12692)	2018-01-29 17:40:44 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) ... * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Rushabh Mehta	b5a3df920c	[fix] primary button color for make	2018-01-23 16:08:52 +05:30
Saurabh	3959aeb848	[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice	2018-01-23 15:40:43 +05:30
Maxwell Morais	7cffd618ab	Serial No, wont relates to the warehouse ... The serial no, picker wont follow the target serial no	2018-01-22 22:33:28 -02:00
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Shreya	39adc8f85f	calculate total when items are removed	2018-01-22 13:08:05 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
rohitwaghchaure	da941af687	Set due date in purchase invoice based on suppler invoice date (#12395)	2018-01-17 16:23:04 +05:30
Nabin Hait	2bfa1803e9	GL Entry on asset sale (#12514) ... * GL Entry on asset sale * Asset sale test case fixed	2018-01-17 14:39:05 +05:30
Saurabh	4b0dd8a159	Merge branch 'master' into develop	2018-01-15 18:36:35 +05:30
Nabin Hait	a2426fcc9e	Get default tax template only if tax template not selected or template is for other company (#12492)	2018-01-15 17:45:46 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
rohitwaghchaure	7b78f6bee6	Added rounded total in the POS and fix rounded issue in js side (#12457)	2018-01-12 16:28:16 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
tundebabzy	da22167741	Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382) ... * add handler for due_date: if due_date is changed and payment terms template or payment schedule is set, ask user to clear them. * ui test cases * cleanup	2018-01-09 10:58:44 +05:30
Sachin Mane	64f48db406	Batch number selector bug fix (#12346) ... * fix bug in batch number selector. fetch and display batch numbers only for the given item code. * remove print statement * Fix error on selecting Chattisgarh in address Fix error on selecting Chattisgarh in address because of spelling mistake * Revert "Fix error on selecting Chattisgarh in address"	2018-01-08 17:57:32 +05:30
Nabin Hait	cb495fb33b	Merge branch 'master' into develop	2018-01-05 13:17:00 +05:30
tundebabzy	8f44d1c63d	Payment Terms in Delivery Note #12167 (#12293) ... * add Payment Terms Template field to delivery note: - This helps for users who create invoice from Sales Invoice - Field is hidden in print - Field is not coupled to Payment Schedule table. * do nothing in payment_terms_template trigger if doctype is Delivery Note	2018-01-05 12:46:50 +05:30
rohitwaghchaure	1f39feb12f	[Fix] PO -> PI non default taxes not fetched (#12313)	2018-01-05 12:25:45 +05:30
Saurabh	14506d7878	Merge branch 'master' into develop	2018-01-02 12:09:25 +05:30
tundebabzy	650a1eeede	recalculate terms when document date changed (#12288) ... * recalculate terms when document date changed * clean up	2018-01-02 12:02:30 +05:30
Javier Wong	2469095a13	Check Meta before Toggling Conversion Factor (#12237) ... If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.	2017-12-29 14:06:47 +05:30
Vishal Dhayagude	f06c281964	[fix] allow to change doc status on get items (#12174)	2017-12-26 16:22:40 +05:30
Nabin Hait	92615901a7	Fixed merge conflict	2017-12-25 13:41:04 +05:30
tundebabzy	590bd0a8e5	trigger payment_terms_template only when needed (#12124)	2017-12-25 11:40:19 +05:30
rohitwaghchaure	bd5e01b09b	[fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134)	2017-12-25 11:28:07 +05:30
rohitwaghchaure	1bc47fa43c	[fix] Sales order tax not fetching on the sales invoice (#12055)	2017-12-16 10:49:58 +05:30
Vishal Dhayagude	d377018695	[fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) ... * [wip] shipping rule * [wip] Shipping Rule tax auto calculate * [wip] Shipping Rule * [new] Shipping charges change on different triggers * [minor] Removed unnecessary comments * [fix] Minor Changes in function calls	2017-12-14 18:06:02 +05:30
rohitwaghchaure	2b95a5438b	POS batch fixes (#12005)	2017-12-14 16:06:23 +05:30
rohitwaghchaure	24e5265281	[enhance] Search customer using primary contact mobile number (#11998) ... * [enhance] Search customer using primary contact mobile number * Update build.json	2017-12-14 13:06:21 +05:30
Ameya Shenoy	cc05c0b348	Agri fixes (#11988) ... * minor fixes in agri * updated desktop.py * [agri] fixed recreation of dotypes in setup.py * setup_wizard changes - converted agriculture from alpha to beta - rearranged the domains alphabetically * [agri] linked doctype is collapsible	2017-12-13 18:50:39 +05:30
Nabin Hait	0f97eda7c9	Merge branch 'master' into develop	2017-12-12 19:17:53 +05:30
Nabin Hait	af9bdfeaa3	Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965)	2017-12-12 18:50:05 +05:30
Shreya Shah	db499dcaa4	fixed fiscal dates (#11939)	2017-12-12 14:19:35 +05:30
rohitwaghchaure	47749f4635	[fix] Cur_frm breaking offline pos (#11955)	2017-12-12 14:16:03 +05:30
rohitwaghchaure	efbc0667ec	[fix] On change of payment terms template, not fetch respective schedule data (#11928)	2017-12-11 14:54:20 +05:30
rohitwaghchaure	505661b5c0	[fix] Wrong company's default tax fetch (#11927)	2017-12-11 14:52:28 +05:30
Nabin Hait	d10014bdeb	minor fix in fetching payment terms template	2017-12-08 16:51:53 +05:30
Ameya Shenoy	5c62368a65	[Agriculture Domain] (#11663) ... * created Soil Analysis, Water Analysis, Weather and Fertilizer doctype * soil doctype edited and crop doctype added * minor stuff * Land Unit + Leaflet * crop cycle added * Land Unit changes + Crop cycle * autoname for plant_analysis * created Agriculture Task * minor stuff * - deleted agriculture_task - current state after the call * [Agriculture] modified fertilizer doctype to have a link to Item This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes * Added fields to `Water Analysis` doctype - Collection Datetime - Laboratory Testing Datetime - Results Datetime (default to Laboratory Testing Datetime) * Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture` - Created `agriculture task` doctype - added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype - edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module * Recursively reflect child land unit feature changes on parents * fixed feature repition bug * added legeneds to ternary plot * added stuff * changes * fix Task * reverted the Task Doctype to have naming in the form TASK.##### * fixed modifications made to TASK doctype * [dirty commit] added auto create Task from Crop on creation of Crop Cycle * Changed the Crop Cycle Doctype - Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle" - Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle - Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle * [Agriculture Module] Modifications - Created childtable doctype "Pest Detected" - Added childtable "Pest Detected" to Pest - Modified "Agriculture Task" to include "Start Day" and "End Day" of task - Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle * [Agriculture Module] fixed Pest doctype not saving issue * [Agrcilture Module] Changes in Crop Cycle - removed the creation of a master task on creation of a new crop cycle - temporary fix to add the pest tasks from the pests added in crop cycle * land_unit_tree.js fields modified to have field objects instead of just field names * Revert "land_unit_tree.js modified" * land_unit_tree.js fields modified to have field objects instead of just field names * [Agriculture Domain] Converted Agriculture Module to a Domain - Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype - Agriculture (alpha) is now a Domain * land_unit area aggregation enabled * land_unit.py checks feature diff for every ancestor and not just the parent * Removed unnecessary print messages * agriculture.py modified to include fixtures * fixtures added to setup.py inside agriculture module * [Agriculture Domain] UI tests added - 'materials' table renamed to 'materials_required' in 'Crop' - wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture - moved creation of tasks from client side to server side in Crop Cycle - Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively - company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms' * [Agriculture Domain] Mostly written server side tests and moved client side code to server side - moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture, - wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest - NOTE: none of the server side codes were tested * [Agriculture Domain] All server side tests working locally * [Agriculture Domain] Testing - added sample test for Land Unit, which needs to be modified to test multiple things - modified tests to be independant of each other * Land Units tests added and area aggregation code migrated to server side * added land_unit server side tests and on_trash added to land_unit * Changing field location for start date * [Agriculture Domain] deleted unnecessary comments * [Agriculture Domain] reverted changes * [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype - Deleted the Pest doctype and replaced it with the more generic Disease doctype - Deleted the Detected Pest doctype and replaced it with Detected Disease doctype * [Agriculture Domain] resolves #11654, resolves #11653 * [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit - not working perfectly yet - docs are fetched but not appended * [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional * [Agriculture] added seperate stage for client side agriculture tests * [Agriculture] minor modification to crop_cycle.js test * [Agriculture] fixed tests * upgrade chromedriver in .travis.yml from 2.32 to 2.33 * [Agriculture] added land unit ui test * [Agriculture] added Agriculture server side test as a seperate stage in travis * tesing travis.yml * [Agriculture] Crop Cycle is able to fetch linked analysis docs * Modified travis.yml for modular server side testing * [minor fix][Agriculture] in soil_texture - fixed multiple soil_texture ternary plot creation on refresh - fixed error on soil composition change * Update .travis.yml * removed location field from linked doctypes * minor fixes and cleanup of agri * minor fix in agriculture and domain patches * permissions added to agriculture - Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes * [Agriculture] - Created Agiculture Analysis Criteria and added sample records to it - All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria - Also Fertilizer does the same This was introduced so that, new parameters could be added on demand * minor changes requested in Agriculture * minor changes * minor fix * Update desktop.py * Update .travis.yml	2017-12-06 18:36:27 +05:30
Prateeksha Singh	7351709980	[multicheck] Select multiple domains in setup (#11709) ... * [multicheck] select multiple domains in setup * use multiple domains in make_sample_data * revert to setting in domains child table * domains slide validation * update setup wizard test	2017-12-06 13:28:06 +05:30
Vishal	397a8761f7	[new] Convert Non Profit Module into Non Profit Domain	2017-12-05 16:41:09 +05:30
Nabin Hait	a11dcb6e59	Pull items in Stock Entry from Purchase Invoice (#11839)	2017-12-04 13:36:50 +05:30
Saurabh	34a0e90115	[fix] merge conflicts	2017-11-30 16:45:01 +05:30
Manas Solanki	f9cc56cd62	minor fixes in the assessment result tool (#11795)	2017-11-30 11:39:06 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770) ... * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
tundebabzy	2a4fefc6ff	Auto fetch batches based on quantity on POS (#11004) (#11767) ... * prevent premature escape when item has serial no and batch no * fetch actual_batch_qty for item * add available_qty to dialog * remove expired batches from drop-down * Update queries.py	2017-11-29 10:53:09 +05:30
tundebabzy	bc7c387a0d	set read only property properly (#11761)	2017-11-28 22:40:05 +05:30
rohitwaghchaure	c037dc775e	Refactor multi pos profile selection in the pos invoice (#11721)	2017-11-28 16:11:15 +05:30
Shreya Shah	dcbc4284d3	expenses included in valuation account type in purchase taxes and charges (#11725)	2017-11-27 11:48:09 +05:30
Manas Solanki	966f141f62	Rename schools to Education (#11524) ... * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch	2017-11-23 15:22:10 +05:30
Helkyd	6e3f789f82	code fixe ... fixed })	2017-11-22 16:12:27 +01:00
Helkyd	3264c13545	No ZERO payment ... If no payment mode selected does not process ... to avoid having SI with payment pending as POS for sure was paid..	2017-11-22 16:06:22 +01:00
Nabin Hait	02ac901345	[fix] Rounding adjustment in company currency	2017-11-22 16:12:20 +05:30
Nabin Hait	036bf6de6e	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-11-21 20:19:13 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
Nabin Hait	0551f7bb00	Cleanup and fixes of payment terms feature	2017-11-21 19:58:16 +05:30
rohitwaghchaure	e8ccc0e942	[enhance] Added multi UOM feature in Material Request (#11352) ... * [enhance] Added multi UOM in Material Request * test cases * patch to update multi uom fields in material request item	2017-11-21 16:17:22 +05:30
KanchanChauhan	0fe455a991	[Minor][Bug] Fix syntax error (#11633)	2017-11-17 20:08:15 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) ... * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Nabin Hait	877e1bb377	Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542)	2017-11-17 12:27:43 +05:30
Britlog	b6096057c6	Hide cart icon and badge count after logging out (#11530)	2017-11-17 11:41:35 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437) ... * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Rushabh Mehta	d5c6416d91	[new feature] Product Configurator (via Item Quick Entry) (#11535) ... * [Feature] Item Variant Creation from Quick Entry * [minor] formatted js * [minor] set 3 attribute per page instead of 5 in template * [fix] fixed codecy issue * [fix] label translation * [minor] changed trigger event of item template * [fix] moved item ui tests under stock * [UI test] added test for item attribute * [UI test] added test for creation of item variant from quick entry * [fix] item variant ui test fixes * [wip] * [cleanup] item quick entry * [remove] tests, fixtures were missing * [refactor] use set_only_once in item	2017-11-14 15:27:28 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Nabin Hait	4d99ebaeb5	Merge branch 'master' into develop	2017-11-14 13:58:37 +05:30
Rushabh Mehta	98aa581864	[fix] default tax only on insert (#11544) ... * [fix] default tax only on insert * [fix] default tax only on insert * [fix] default tax only on insert	2017-11-14 09:32:32 +05:30
Saurabh	0faa61009f	Merge branch 'master' into develop	2017-11-03 16:56:23 +05:30
rohitwaghchaure	7677ff00a2	[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)	2017-11-02 18:12:14 +05:30
Jay Parikh	96f167573b	POS - Add % to the Discount Field #9749	2017-10-31 01:07:09 -07:00
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Makarand Bauskar	e6712c129c	[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182) ... * [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings * [minor] renamed the allow_stale_rate method to stale_rate_allowed	2017-10-25 12:17:40 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020) ... * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
tunde	37c2b6116c	Merge branch 'develop' into payment-terms	2017-10-09 15:42:47 +01:00
Rohit Waghchaure	beeba8b37a	[Fix] Discount field not displaying in offline POS	2017-10-06 09:50:43 +05:30
Makarand Bauskar	f23788bb7d	[hotfix] Show Make button only for Email communication (#10876)	2017-10-05 14:19:45 +05:30
tunde	19e63b73ed	Merge branch 'develop' into payment-terms	2017-10-03 12:02:38 +01:00
Nabin Hait	7b6eaee05b	Fixes to handle async events (#11018) ... * Fixes to handle async events * transaction.js code cleanup * Don't map taxes and charges while making PO from SO for drop-ship * Removed print	2017-10-03 01:09:46 +05:30
Nabin Hait	1f10d693e9	Don't set currency as company currency if default currency is different (#11011)	2017-10-02 13:20:51 +05:30
Nabin Hait	8919669ac2	Merge branch 'master' into develop	2017-10-02 12:28:27 +05:30
rohitwaghchaure	88491715e0	[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)	2017-10-02 12:13:36 +05:30
Makarand Bauskar	b1bf502119	[hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' (#11007)	2017-10-02 11:38:03 +05:30
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
tundebabzy	5510d0751d	correctly set frm company currency (#10944)	2017-09-29 15:21:59 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Nabin Hait	76e1ca35ad	Merge branch 'master' into develop	2017-09-27 13:05:21 +05:30
rohitwaghchaure	45d45f4247	[hotfix] Wrong calculation of total in taxes and totals (#10924)	2017-09-27 11:49:13 +05:30
tunde	567119170e	Merge branch 'develop' into payment-terms	2017-09-26 17:28:07 +01:00
tunde	79f9a4aef1	bug fix: sales invoice always dirty even after reloading	2017-09-26 10:39:30 +01:00
Nabin Hait	39c2f75e6d	Merge branch 'master' into staging	2017-09-25 16:03:32 +05:30
Nabin Hait	cb5e1e550f	Merge branch 'master' into develop	2017-09-25 16:03:31 +05:30
Nabin Hait	3d5d858933	set total in tax table if category not valuation and consider deductions (#10870)	2017-09-21 16:15:30 +05:30
tunde	82de375ba0	Merge branch 'develop' into payment-terms	2017-09-21 11:21:05 +01:00
tundebabzy	ab5b03011d	Enhance Currency Exchange Management (#10482) ... * add new settings in Accouts Settings * patch for new settings * refactor `get_exchange_rate` * adds validation * tests validation * disables conversion rate field if stale rates not allowed * more test cases more test case... test `get_exchange_rate` behaviour with stale not allowed in sett.. fix currency exchange test case do housekeeping after running accounts settings test * clean up * documentation * make use of correct api url * Fix tests failing due to wrong exchange rate from fixer.io * remove mandatory constraint from `allow_stale` * added info to documentation	2017-09-21 14:50:39 +05:30
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
Nabin Hait	2e4de83df6	Rounding Adjustment via a separate field, instead of last tax row (#10659) ... * Rounding Adjust via a separate field, instead of last tax row * Fixed test cases	2017-09-19 14:53:16 +05:30
rohitwaghchaure	850eaa73b0	Move subscription module to accounts (#10772)	2017-09-18 17:23:00 +05:30
Manas Solanki	a22c94c246	refactored assessment result tool (#10633) ... * save the assessment instead of submit * Added comments in the artool * remove the cur_frm and message for submitted result * link field for the assessment result	2017-09-18 16:59:54 +05:30
tunde	9448f4b13c	codacy corrections	2017-09-18 12:08:34 +01:00
Rushabh Mehta	f056974bc5	[domain] Healthcare (#10664) ... * Medical module for erpnext * Changes in core for Medical module * patient registration updated * fix - appointment invioce - fields missing * pages- indicator instead of bg-color * Lab Test field renamed service type * Department added Lab Test * procedure name in prescription * fixes sample collection * filter disabled patient * fix patient admission * updated patient age * availability check msg updated * fixes, removed procedure from invoice * sample print renamed * fixes, validation * service desk physician in filter * refactor scheduler * Appointment -field property - set only once = 1 * Appointment - Mark closed and pending buttons removed * Appointment - readonly = 1 if value set * Appointment - availabilty * Appointment - Cancel - info - cancel invoice * Appointment - set pending appointments * Dosage form - new DT * Drug Prescription - Dosage form added * Facility - Floor - removed from Fecility * Floor - removed * Lab Test Template - item creation validation * Procedure - Create Procedure * Procedure Appointment - new DT * Service Unit - Floor reference removed * Zone Fcilities - Unused DT removed * Appointment Desk - fixed * Service Desk - method pointing from procedure changed to procedure_appointment * Consultation print - got featured * Consultation - removed patient refernce to procedure prescription * Procedure Prescription - removed patient refernce * Lab Test - Changed field properties and value * Lab Test - field property changed * Lab Test - methods rewrite - lab test doc creation * Lab Test - create lab test from invoice and consultaion - got changed * Button History changed to Medical Record * Service Desk - Updated * Notification - Procedure Appointment * fix-get procedure prescription * fix field added to test prescription * msgprint on invoice creation * fix data on install * Merge branch erpnext/develop * fixes- minor * Setup wizard - Create Sensitivity * Appointment - Validate and Save if there is no schedule for Physician * Consultation - Button create vital signs and medical record * Review Type - New DocType * Review Detail and Treatment Plan - Childs - Consultation * Patient Medical Record - field Attach doc * Consultation - New Fields * Consultation - Manage new Fields - Medical record add action * Patient Relation - Child DocType - Patient * Patient - Patient Relation added * Patient - collapsible = 1 * Laboratory Settings - fields - message for lab test * Laboratory Settings - get message for lab test * SMS text for lab test and invoice test report * Procedure Stock Detail - Stock detail for Procedure and Template * Template Stage Detail - Stage detail for Procedure Template * Procedure Stage Detail - Stage detail for Procedure * Service Unit - field - warehouse * Scheduler - msg - content changed * Laboratory Settings - defualt - msg content * Invoice Test Report - msg print * Print Format-Changed-Consultation-Invoice Test Report-Lab Test * OP Settings - Expnse Account for Stock Entry in Procedure * Procedure and Procedure Template - Manage Stock Stage and Sample Collection * Procedure Appointment - Manage Stock and Stage * Lab Test - fixed - resource not find * Invoice Test Report - fixed - resource not find * Procedure - doc reload after insert * Patient Medical Record - fixed - refernce missed * Create Vital Signs -on client side * Rename module Medical to Healthcare * Remove In Patient (IP) Feature. * Rename - Procedure to Clinical Procedure * Remove spaces in Naming Series * Rename Duration to Drug Prescription Duration * Duration to Drug Prescription Duration * Merge All Settings to Healthcare Settings * Healthcare settings - import fixed * Procedure related documents are removed * Appointment Desk and Sevrvice Desk are removed * Consultation - minimal * Consultation - minimal * Consultation - minimal - patient detials in collapsible section * Message Print to Alerts * Patient - some fields removed * Patient - create consultation - message print to alerts * Consultation - show patient details updated * Setup wizard - Duration to Drug Prescritpion Duration * Healthcare Settings - patient registration - fee collection * Lab Test - Create Sales Invoice bug fixed * Healthcare menu rearranged * Healthcare Settings - Optimised and Rearragnged * Healthcare Settings - Expense account removed * Receivable account removed from patient * Patient - Optimised and Rearragnged * Removed Referring Physician * Healthcare Settings - bold headings removed * Physician - Patient - Fields are Segregated * Remove Service Unit * Remove - Service Type * Consultation invoice * Lab Test - invoice * Patient - Invoice * Rename Appointment to Patient Appointment * wip * Patient Dashboard, Physician Form cleanup * Dosage renamed to Prescription Dosage * Renamed Drug Prescription Duration to Prescription Duration * Patient Appointment booking modal * Patient Age - calculate by dob * Remove - scheduler * Consultation - Appointment to Patient Appointment * Patient Dashboard - rearranged * Patient Appointment * Removed rer_physician from lab test and consultation * Patient Appontment Changes * Appointment and Consultation - optimized * Patient Appointment - fee validity code optimized * Consultation and Patient Appointment - Invoice validate two side * fix: #13 remove relation to admission * Healthcare - Patient Portal * fix import error * domain Healthcare added on install * Removed - Invoice Test Report * Physician Schedule - menu * Consultation - patient details - re write * New Doctype-Medical Code * Consultation - Daignosis codification * Medical Code - Codification - Settings * Medical Code Standard - Medical Code - Codification - Settings * fix appointment calendar * fix appointment analytics * Menu Medical Code Standard * New Doctype - Medical Code Standard * Set Physician Role insted of IP Physician and OP Physician Role * fixed some json files * Medical code - permission to physician * Unused Childs - Work Schedule and User List - Removed * Label Procedure to Lab Test * Lab Test and Patient - code optimised * Add Item Groups - setup wizard * Healthcare Settings - add Role - Medical Administrator * Healthcare - Demo setup - Make Demo * Fee Validity - Logic Test * Test Fee Validity - Optimised * Healthcare Doctypes - Restricted to Domain Healthcare * Domainify - remove Healthcare Roles - Other Domains * Healthcare doctypes - beta checked * Codacy fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Lab Test - print hide =1 for some fields * Consultation - Codification field label to Medical Coding * Codacy fixes - import frappe and etc. * Codacy fixes - import frappe in test_vital_signs * Codacy fixes * Codacy fixes * Codacy fixes and remove delete perm for patient * send_sms - import form frappe * Healthcare Settings * Lab Prescription - Consultation - Test Code - read_only = 0 * Portal fixes * Patient Appointment - filter physician - if has schedule * Physician - IP Charge - Removed * test - files * Web Form - Patient Profile - removed * Role Medical Administrator to Healthcare Administrator * WIP healthcare documentation * Coday - fixes * Travis - fixes * Lab Test Report - menu * Reorder Healthcare settings - group lab config to bottom * Sample Collection - New - allow Sample and patient Selection * Rate - similar behaviour and Label as in Item Standard Selling Rate * Healthcare documentation * Lab Test Samples to Lab Test sample * Commplaints to Complaint * Commplaints to Complaint * Antibiotics to Antibiotic * Appointment Token Number - remove * View - Medical record * Codacy fixes * update healthcare docs * Cleanup Docs - Search, quick entry, trsck change, etc. * [minor] ux changes	2017-09-13 12:52:30 +05:30
tunde	df3a175974	fix bugs: add payment_schedule if payment_terms_schedule specified	2017-09-11 11:02:57 +01:00
tunde	199daf7ac5	Merge branch 'develop' into payment-terms	2017-09-08 09:59:13 +01:00
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
rohitwaghchaure	1b65575860	Merge branch 'develop' into pos-refactor	2017-09-07 17:15:58 +05:30