Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,877 Commits 3 Branches 0 Tags 1 GiB
2859300fe6
Commit Graph

15728 Commits

Author SHA1 Message Date
Jamsheer
e82f27ac10 Healthcare - Invoice Drug Prescription 2018-09-03 11:26:17 +05:30
Jamsheer
197cd88d36 Lab Test Template - rate updation - fix 2018-09-03 11:26:17 +05:30
Jamsheer
a5c3fc69b8 Patch - Healthcare - Invoice - fix 2018-09-03 11:26:17 +05:30
Jamsheer
8da6f4e30c Healthcare - Invoice - Redesign 2018-09-03 11:26:17 +05:30
Jamsheer
25e535c66f Clinical Procedure Item - Remove field invoiced 2018-09-03 11:26:17 +05:30
Jamsheer
1646010059 Clinical Procedure - Consumables Invoice Separately 2018-09-03 11:26:17 +05:30
Jamsheer
0eb64ca38b Healthcare Settings - Filter For Service Items 2018-09-03 11:26:16 +05:30
Jamsheer
edf8821a4e Healthcare Settings - fields - service items 2018-09-03 11:26:16 +05:30
Jamsheer
b2a615b8e8 Healthcare Practitioner - new field - Inpatient Visit Charge 2018-09-03 11:26:16 +05:30
Jamsheer
7f51ffa5eb Patch - Healthcare - Redesign Billing - fix 2018-09-03 11:26:16 +05:30
Jamsheer
eafb046fce Healthcare Utils - prescription - invoice - fix 2018-09-03 11:26:16 +05:30
Jamsheer
fd2879c077 Patch - Healthcare - Redesign Billing 2018-09-03 11:26:16 +05:30
Jamsheer
c6974a79a8 Sales Invoice - show Healthcare Fields - Healthcare in active Domains 2018-09-03 11:26:15 +05:30
Jamsheer
94efed161a Fee Validity - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
146683bbff Fee Validity - invoice reference 2018-09-03 11:26:14 +05:30
Jamsheer
f7a6531fb3 Inpatient Record - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
54ae74eb28 Inpatient Billing 2018-09-03 11:26:14 +05:30
Jamsheer
8cb142bf29 Field Changes - Healthcare Invoice Work Flow Redesign 2018-09-03 11:26:14 +05:30
Jamsheer
bab55390f8 Sales Invoice in Patient Dashboard 2018-09-03 11:26:14 +05:30
Jamsheer
ba11972302 Healthcare Service - Invoice Work Flow - Redesign 2018-09-03 11:26:14 +05:30
Frappe PR Bot
3921660747 [Translation] Updated Translations (#15285) 2018-09-03 11:14:57 +05:30
Saurabh
0754ece288 Patch fixes (#15295) 
* patch fixes

* [Fix] disable shopify if any exception occured while
 2018-09-03 10:44:40 +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
Prateeksha Singh
2cf52e53dd Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-02 19:46:30 +05:30
Prateeksha Singh
a094c0f3f1 [fix] encrypted password in Hub User child record by frappe/frappe#6048 
- use save() instead of insert()
 2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods 
- wip
 2018-09-02 18:29:00 +05:30
Nabin Hait
41b630759c fixed type 2018-09-01 18:37:07 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +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
810ae01832 [hub] make client connection for first registered user 
- remove usage of Hub Connector
 2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962 [fix] hub_url -> marketplace_url 2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248 [fix] save() -> insert() for single doc, use doc.append in child table 2018-09-01 00:12:17 +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
3588486e5b
[fix] hub_settings -> marketplace_settings in call 2018-08-31 20:12:33 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
dc1a2e2a37 fix: Allow read permission to everyone on Marketplace Settings 2018-08-31 17:31:22 +05:30
Nabin Hait
f1a3fbdb6b minor fixes in dropship 2018-08-31 17:05:20 +05:30
Fisher Yu
2e5c776293 Update sales_order.py 
1. filter out the suppliers by which the dropship purchase order already created
2. allow create multi dropship draft purchase orders
 2018-08-31 17:05:20 +05:30
Fisher Yu
102bc7f5cf Update sales_order.js 
for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.
 2018-08-31 17:05:20 +05:30
Rohit Waghchaure
12b4096e68 [Minor] Don't validate on cancelled budgest 2018-08-31 16:54:59 +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
Valmik
2175b90b8d Added feature to optimize routes, also cleaned up code (#15193) 2018-08-31 16:39:29 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255) 
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

* fix(unused-import): assessment-plan.py

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
 2018-08-31 16:12:49 +05:30
Faris Ansari
25f509ebd3 feat: Add disable marketplace option in Hub Settings 2018-08-31 15:35:32 +05:30
Nabin Hait
1b73505391
Update sales_invoice.py 2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d minor fixes 2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9 minor fixes 2018-08-31 14:49:20 +05:30
Ameya Shenoy
203152d67e indentation: fixes 2018-08-31 14:33:48 +05:30
Nabin Hait
e033df2757 minor fixes 2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06 Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date 2018-08-31 12:39:46 +05:30
Saurabh
5c3590fa8d Merge branch 'master' into develop 2018-08-31 11:29:14 +05:30
Saurabh
648191b9e8 bumped to version 10.1.50 2018-08-31 11:59:13 +06:00
Shreya Shah
ee8f8281b4 [py3] Convert filter object to list (#15260) 2018-08-30 19:22:22 +05:30
Faris Ansari
91ac26c2ff fix(seller dialog): Email should be session user email (#15270) 2018-08-30 19:19:57 +05:30
rohitwaghchaure
624927bf0b [Fix] Not able to export the Supplier-Wise Sales Analytics report (#15271) 2018-08-30 19:19:14 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Bassam Ramadan
8d7c1868d6 fix for fields names at sales invoice return payments and verifying the payment amount (#15245) 
* fix for payments field names in sales invoice return

* add verification for payment amount at sales invoice return

adding verification to be sure the payment amount is negative at sales
invoice return

* correction for precision field name
 2018-08-30 19:15:15 +05:30
KanchanChauhan
0cd5313c69 Validate Completed Qty and Produced qty in Stock Entry for Manufacture (#15248) 2018-08-30 19:11:15 +05:30
Nabin Hait
9983d41fb0 Fixed divison error 2018-08-30 19:10:36 +05:30
Faris Ansari
00f6aef947 fix(publish items): Filter out disabled items (#15268) 2018-08-30 18:54:28 +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
Shreya Shah
68348d4130 [Attendance-Tool] Filter employees based on date of joining (#15262) 2018-08-30 17:25:58 +05:30
Shreya Shah
3df2639a32 Optimize patch (#15263) 2018-08-30 17:24:03 +05:30
Prateeksha Singh
75ae844d70
Merge pull request #15247 from frappe/hub-redesign 
[encore] MarketPlace
 2018-08-30 17:12:41 +05:30
Prateeksha Singh
ecad873d19 [hub] remove item.js, fix seller decription condition 2018-08-30 16:21:26 +05:30
Nabin Hait
2390da647f GSTR-1 minor fixes 2018-08-30 16:16:48 +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
a4c24bda65 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 12:01:39 +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
Faris Ansari
d32e7f8d02 fix: Administrator cannot register on marketplace 2018-08-30 11:53:46 +05:30
Faris Ansari
95e4141bf2 fix: Remove unused imports 2018-08-30 11:46:14 +05:30
Zlash65
80f5cb05cc fixes in setting end_date and manual provision of start&end date 2018-08-30 10:39:48 +05:30
Zlash65
91eae54383 manually provide start and end date 2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6 start date logic fix 2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943 end date / stop date calc fix 2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383 end date should reset if start date is changed 2018-08-30 10:39:48 +05:30
Zlash65
d676a67769 validate changing service stop date once its set 2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15 book last gl_entry based on service stop date 2018-08-30 10:39:48 +05:30
Zlash65
243863a290 validation for stop date added 2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e service stop date field added 2018-08-30 10:39:48 +05:30
Rushabh Mehta
20fd2ddd1c ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
Prateeksha Singh
04d051bb73 [hub] add review area 2018-08-30 02:42:13 +05:30
Prateeksha Singh
89ed2d9b34 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 02:33:28 +05:30
Prateeksha Singh
a6f184bcb7 [hub] remove old post and preprocess, log with minimal info 2018-08-30 02:30:40 +05:30
Faris Ansari
114d595de9 fix: Set hub_url in Hub Settings 
- add patch to set the value
 2018-08-29 18:24:49 +05:30
Faris Ansari
e4c7729089 fix(Hub Settings): Set site_name before seller registration 2018-08-29 17:13:43 +05:30
Faris Ansari
b7126c23f7 fix(Hub Settings): Remove unused fields 2018-08-29 17:13:16 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab (fix)test case: loyalty program, course schedule and more 2018-08-29 17:05:11 +05:30
Faris Ansari
458cf6fcc5 style: remove trailing spaces 2018-08-29 16:19:39 +05:30
Faris Ansari
8683bd82ed fix: Base64 extraction 
- use requests to fetch the image without storing it anywhere
- only read local files
 2018-08-29 16:18:36 +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
Nabin Hait
af497ef669 bumped to version 10.1.49 2018-08-29 13:43:53 +06:00
Nabin Hait
6b539d65d7 Restored missing rounded_total fields 2018-08-29 12:41:23 +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
Zarrar
34208cc89d
Revert "Google maps settings" 2018-08-28 17:25:21 +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
811a2deb0f fix: Load and save base64 image in publish 2018-08-28 17:17:29 +05:30
Faris Ansari
5689494f9c chore: Remove old messages page 2018-08-28 16:52:17 +05:30
Saurabh
5b398f293a [fix] typo fix 2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0 [fix] naming series refactor patch 2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895 [fix] naming series refactor patch 2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7 [fix] naming series refactor patch 2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74 [fix] fix google map imports (#15240) 2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf [fix] naming series refactor patch 2018-08-28 15:18:48 +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
Nabin Hait
2b9186da5a [fix] naming series patch 2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307 [fix] for python 3 2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7 [fix] missing functions related to google maps 2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c minor fix 2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094 [minor][fix] call update_percent_complete via validate (#15235) 2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f Improve performance for warehouse tree (#15207) 
* Fix conflicts

* Modify query structure

* Remove whitespaces
 2018-08-28 13:46:22 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Saurabh
1898e11585 patch sequence fix 2018-08-28 13:04:40 +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
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +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
Zarrar
93577665f2 [Enhance] Multiselect for Cost Center and Project (#15208) 
* add filter for Cost Center, make CC & Project multiselect field

* update queries according to project/cost_center multiselect

* add multiselect filter for cost_center and project

* update query according to multiselect
 2018-08-27 12:08:53 +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