Commit Graph

674 Commits

Author SHA1 Message Date
Frappe Bot
8e1326f22f Merge branch 'staging' into develop 2018-12-10 16:05:45 +00:00
Frappe Bot
ee97a46fde bumped to version 11.0.3-beta.28 2018-12-10 16:05:45 +00:00
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Frappe Bot
0509d82701 bumped to version 11.0.3-beta.27 2018-12-10 13:08:33 +00:00
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
4f1c659050 bumped to version 11.0.3-beta.26 2018-12-06 09:50:24 +00:00
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Ameya Shenoy
5780e865b7 bumped to version 11.0.3-beta.25 2018-11-28 08:28:36 +00:00
Frappe Bot
8c7373dfd0 Merge branch 'staging' into develop 2018-11-15 09:45:05 +00:00
Frappe Bot
d9dccaefba bumped to version 11.0.3-beta.24 2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197 bumped to version 11.0.3-beta.23 2018-11-15 09:37:17 +00:00
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Frappe Bot
a4fe912382 bumped to version 11.0.3-beta.23 2018-11-15 09:19:18 +00:00
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Frappe Bot
fac49983a0 bumped to version 11.0.3-beta.22 2018-11-14 11:32:34 +00:00
Frappe Bot
fe62024824 bumped to version 11.0.3-beta.21 2018-11-13 11:41:27 +00:00
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Frappe Bot
a29237beeb bumped to version 11.0.3-beta.21 2018-11-13 11:23:06 +00:00
Doridel Cahanap
2b14d6a058 Contract Manufacturing : Customer Provided Items ()
* 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
Frappe Bot
9159ee83ca bumped to version 11.0.3-beta.20 2018-11-09 10:19:21 +00:00
Ameya Shenoy
49647bfecc fix: develop version should be 12 () 2018-11-08 12:48:35 +05:30
Ameya Shenoy
675636cd03 bumped to version 11.0.3-beta.19 2018-11-06 11:13:36 +00:00
Ameya Shenoy
5ed0257ce2 bumped to version 11.0.3-beta.18 2018-11-05 06:50:33 +00:00
Ameya Shenoy
9f20f777b2 bumped to version 11.0.3-beta.17 2018-10-31 13:51:24 +00:00
Ameya Shenoy
d45fef5423 bumped to version 11.0.3-beta.16 2018-10-30 12:53:35 +00:00
Ameya Shenoy
6adcfa6032 bumped to version 11.0.3-beta.15 2018-10-23 12:56:51 +00:00
Ameya Shenoy
4293d17602 bumped to version 11.0.3-beta.14 2018-10-23 08:05:33 +00:00
Ameya Shenoy
7e97230c92 bumped to version 11.0.3-beta.13 2018-10-19 12:56:48 +00:00
Ameya Shenoy
a7a32d7400 bumped to version 11.0.3-beta.12 2018-10-17 09:44:11 +00:00
Ameya Shenoy
8d0195246d bumped to version 11.0.3-beta.11 2018-10-15 12:24:12 +00:00
Ameya Shenoy
d791af8331 bumped to version 11.0.3-beta.10 2018-10-11 06:58:13 +00:00
Ameya Shenoy
563b1d153b bumped to version 11.0.3-beta.9 2018-10-08 09:43:48 +00:00
Ameya Shenoy
0bd254b02b bumped to version 11.0.3-beta.8 2018-10-08 07:27:35 +00:00
Ameya Shenoy
cfdd629fd7 bumped to version 11.0.3-beta.7 2018-10-07 07:59:34 +00:00
Ameya Shenoy
cd9be8f0a6 bumped to version 11.0.3-beta.6 2018-10-07 06:23:22 +00:00
Ameya Shenoy
538678afc4 bumped to version 11.0.3-beta.5 2018-10-05 09:09:53 +00:00
Ameya Shenoy
2291558c5f bumped to version 11.0.3-beta.4 2018-10-04 13:14:29 +00:00
Ameya Shenoy
5ae344593e bumped to version 11.0.3-beta.3 2018-10-04 11:42:56 +00:00
Charles-Henri Decultot
efd776da46 Events in timeline ()
* Events in timeline

* Namespace correction

* Codacy correction

* Addition of sales partners in participants

* Correct json indent
2018-10-03 10:41:26 +05:30
Ameya Shenoy
90197dd341 bumped to version 11.0.3-beta.2 2018-09-26 08:52:54 +00:00
Ameya Shenoy
b8a5fb7392 bumped to version 11.0.3 2018-09-26 07:32:44 +00:00
Ameya Shenoy
cdedb27cf0 bumped to version 11.0.2 2018-09-21 11:04:20 +00:00
Zarrar
e83ff38c10 [Enhance] Deferred Expense ()
* 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
Saurabh
3ef12bb7f2 bumped to version 11.0.1 2018-09-20 14:00:46 +06:00
Pawan Mehta
6010a10ad1 Amazon MWS Connector ()
* [fix] 

* [fix] 

* codacy issues

* Codacy fixes-1

* Travis Fix

* fix codacy

* fix codacy

* review changes 1

* Custom fields and fixes

* remove amazon id

* remove item.json and sales_order.json

* added back sales_order and item files
2018-09-05 17:16:57 +05:30
KanchanChauhan
73bd3cb278 Moved daily event (update_latest_price_in_all_boms) to daily_long since it was timing out () 2018-09-05 11:01:35 +05:30
Neil Trini Lasrado
771fbb8f01 Cleaned up welcome email code () 2018-08-24 15:15:56 +05:30
Solufyin
3be899caff Item Alternate Image Features in e-commerce site. ()
* [ADD] Added Item Alternate Image Features in e-commerce site.

* [IMP] Improved Code for Item Alternate Image Feature.

* [IMP] Improved code for Item alternative image functionality.

* Remove .css file and make a build for erpnext-web.css

* Cleanup styling for item alternate image, also add delegated handler

* Spaces -> Tabs

* Spaces -> Tabs in item.html
2018-08-07 18:28:39 +05:30
Saurabh
dfdad651ea Update staging version to support symentic versioning 2018-07-19 13:36:32 +05:30
Jamsheer
f926911399 [Enhance][Fix] Healthcare - DocType and Fields renaming ()
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot

* Role name change

* Rename DT - Physician Schedule to Practitioner Schedule

* Rename DT - Physician Service Unit Schedule

* Rename DT - Physician to Practitioner

* Lab Test Template - field disabled in standard filter

* Patient - customer creation fix

* Rename DT - Consultation - Encounter

* Patches.txt updated for rename doctypes and fields in Healthcare

* Patch - Rename doctypes and fields in Healthcare Domain

* Fix - Patch - rename_healthcare_doctype_and_fields

* Vital Signs - New Fields - Abdomen, Tongue and Reflexes

* Web Form - Patient - Personal Details

* Rename DocType Physician to Healthcare Practitioner

* Rename DocType Consultation to Patient Encounter

* Web Form - Personal Details - Fix

* Web Form - Personal Details - Codacy Fix

* Healthcare patch run for all domain

* Rename label Practitioner to Healthcare Practitioner

* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Saurabh
b6d5f1fea1 [fix] add staging version () 2018-07-13 11:33:31 +05:30
Saurabh
e8345f9ae0 add key to trace beta version () 2018-07-10 19:05:38 +05:30
Shridhar Patil
4987c4ef53 on delete contact update issue ()
* on delete contact update isuue

remove contact from issue if the deleted contact exists

* moved issue update function to issue.py

* Update formatting and comment
2018-07-03 10:10:04 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … ()
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
2018-06-28 23:43:23 +05:30
asbasawaraj
4c263480c9 Certfication Application Doctype and webform,Certfied Consultant DocType () 2018-06-15 10:04:19 +05:30
Shreya Shah
02575d1f2c
Merge pull request from Alchez/frappe-contract
[Feature] Managing Contracts in ERPNext
2018-06-14 17:57:02 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional ()
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Rushabh Mehta
0d19744b17 [fix] for notification 2018-06-14 09:23:32 +05:30
Prateeksha Singh
0738483343 [docs] remove docs folder 💥, update docs app to foundation () 2018-06-14 09:11:05 +05:30
Shreya Shah
4fa600a8dd Apply GST based on Origin and Place of supply GST Code ()
* Add new gst field in Taxes and Charges template - is_inter_state

* Add a patch

* Add a regional function to fetch taxes on the basis of GSTin

* Add regional function to hooks.py

* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN

* Fixes in the setup.py for India region

* Set is_inter_state field

For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.

* Fix as per review comment
2018-06-05 11:27:53 +05:30
Rohan Bansal
bf0f0aaf6f Add Contract-related doctypes to ERPNext 2018-06-04 15:56:38 +05:30
Ranjith Kurungadam
375db6181d Earned Leave ()
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this

* Earned Leave monthly scheduler method, test

* remove whitelist of method
2018-06-01 16:09:28 +05:30
Manas Solanki
2f4e5ee2c2
Update hooks.py 2018-05-15 15:25:14 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account 2018-05-15 15:20:44 +05:30
Manas Solanki
0393848f60 deferred account in the item and company master 2018-05-15 13:04:01 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Rohit Waghchaure
aa7b434270 Create asset adjustment doctype, post gl entry for the asset 2018-05-14 19:07:40 +05:30
tundebabzy
caae0f4dcc Merge branch 'develop' into new-subscription 2018-04-17 09:34:04 +01:00
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Vishal Dhayagude
2505c74d64 Place of Supply set on save Delivery Note if Customer Address Present () 2018-04-04 11:05:21 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order ()
* 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
tundebabzy
0125f7b130 rename to Subscription and transfer present Subscription records to Auto Repeat in frappe 2018-03-12 13:51:47 +01:00
tundebabzy
2970630ed2 Merge branch 'develop' into new-subscription 2018-03-12 02:00:34 +01:00
Nabin Hait
0357fbc9c1 commonfied regional function for checking delete permission 2018-03-09 13:19:52 +05:30
theopen-institute
38cbd71352 prevent deletion of sales invoices if country is nepal 2018-03-09 12:39:40 +05:30
tundebabzy
9e863b9572 Merge branch 'develop' into new-subscription 2018-03-02 11:10:27 +01:00
tundebabzy
0ec445214c hook to hourly scheduler 2018-03-01 11:54:32 +01:00
Ameya Shenoy
c20901443e updated develop_version to 11 () 2018-02-28 17:38:23 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Nabin Hait
06bace9089
Fixed develop version 2018-02-22 14:36:26 +05:30
Suraj Shetty
d3069fee4d Daily work summary refactor ()
* added daily work summary setting doctype and code to support feature

this will allow multiple setting for daily work summary

* added daily work summary setting user doctype

* made changes in daily work summary code

* [minor] entry change in hr config file

* deleted previous daily work summary settings (and its company) doctype

* removed unwanted permission check

* toggled read_only option for enabled field

* removed print statements

* add patch for the changes

* doc changes

* [minor] indentation fix

* fixed tests

* indentation fixes

* codacy issue fix

* formatting fixes

* renamed doctype

Renamed Daily Work Summary Setting to  Daily Work Summary Group and did related code and doc changes

* fixed typo

* updated doc

* codacy issue fix

* [minor] renamed doctype name in json

* Renamed old doctype

* fixed indentation

* codacy fix

* indentation fix

* renamed doctype

* handled patch exception

* fixed exception

* Update daily_work_summary_group.py

* rename patch file

removed abbreviation in file name

* handled exception in patch code

* removed Unnecessary pass statement

* [minor] indentation fix
2018-02-21 15:15:43 +05:30
Charles-Henri Decultot
b8c088edb7 Transaction Log for France ()
* Regional overrides for France

* Addition of tests and documentation
2018-02-21 11:07:33 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ()
* GSTR1 for B2B ()

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings ()

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings

* Update gstr_1.py

* GSTR1 for B2B, B2CL and B2CS ()

* [Report] GSTR - 1 CDNR Report ()

* [wip] cdnr

* [WIP] cdnr with optional data

* [wip] Export GSTR-1

* [minor] Minor changes in export

* [new] Custom field added for GST

* [fix] Minor changes in GSTR1 Report

* [minor] Minor changes in gstr1

* [fix] Codacy Fixed

* Update setup.py

* [wip] Gstr2

* [fix] Fetch correct Tax Details

* [minor] ITC data append to row

* [fix] CDNR negative value

* Cleanup and fixes on GSTR-2

* Minor fixes in gstr reports ()

* [new] B2C limit fetch from GST Settings ()

* [new] b2c limit fetch from gst setting

* [fix] Patch Added for b2c limit

* Update gstr_1.py

* Update utils.py

* Cusotm fields related GSTR2

* minor fixes

* minor fixes

* some more fixes

* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
b02c109e1d Cleanup and fixes on GSTR-2 2018-02-05 16:09:51 +05:30
Nabin Hait
619c42b934
GSTR1 for B2B () 2018-01-10 17:48:03 +05:30
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise ()
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
2017-12-28 14:20:13 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages ()
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
2017-12-21 11:55:58 +05:30
Zarrar
de8f6120f3 [Fix] Restrict domain specific roles ()
* restrict roles to its specific domain

* missing hook for Non Profit
2017-12-13 18:36:08 +05:30
KanchanChauhan
34ed1df9ef [Minor] Update Status based on Asset Maintenance and Asse Repair () 2017-12-12 15:03:21 +05:30
Ameya Shenoy
5c62368a65 [Agriculture Domain] ()
* 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 , resolves 

* [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
Nabin Hait
419db49806 non-profit module cleanups 2017-12-06 12:57:53 +05:30
Vishal
74fb550a70 [new] sidebar added on chapter web page 2017-12-05 16:41:09 +05:30
Vishal
a6a302f8a6 [new] Grant Application Web Form Added 2017-12-05 16:41:09 +05:30
Manas Solanki
84e9d45055 Minor fixes for the Education domain ()
* add the new role Education Manager for education settings

* minor changes in the hooks for bootinfo

* Fix for amending the assessment plan
2017-11-28 18:04:08 +05:30
Kanchan Chauhan
e58a41a8a2 Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
hiousi
d81e9f30dd [fix] issue ()
using bench export-fixtures create a erpnext/fixtures/web_form.json file 
see :
https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063
2017-11-17 11:42:24 +05:30
Rushabh Mehta
bc4e2cd9c1 [added] hospitality domain ()
* [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
Manas Solanki
0518001bdc Changes in Student Admission ()
* configurable student admission

* validate dob and admission date from student admission

* add in hooks and fix codacy
2017-10-05 14:31:31 +05:30
Nabin Hait
26507d7867 Removed deprecated hub functions 2017-10-05 13:10:32 +05:30
Faris Ansari
fd345f8e90 Hub ()
* [WIP]Hub

* [listing] Show items, users and item_groups

* Show filters

* [start] cart, api for rfq and opp

* rfq working

* [wip] keys

* wip quotes

* [hub] register/unregister

* [hub] rename password to access_token, remove passed company field

* [hub] publishing cases, api call wrapper

* [hub] add and remove fields working

* [hub] fix flags, update on client save working

* [hub] new hub page, client item CUD at hub working

* listing, standard rate, local site hack

* item listing, item page, search, back to home

* [hub] implement hub company

* [hub] company filter

* [hub] basic rfq-ing, item page cleanup

* categories wip

* [hub] use get_doc_before_save()

* [hub] send opportunity message to hub, api to make locally

* [hub] enqueueing in hub api request wrapper

* cleanup

* [hub] refactor shopping cart's product.py to reuse

* sync dynamic item fields daily

* Scheduler heartbeat check

* [wip] hub categories

* [hub] wip enqueued callbacks

* [hub] outgoing messages, fixing callback loop

* [hub] bug: callback save after primary save

* [hub] pricing, stock, currency

* [hub] replace send_hub_request with make_and_enqueue

* add hub.less, refactor code

* Remove template html files, add styling for hub item cards

* fix paging

* add breadcrumb

* Add sidebar

* [hub] add company page, change country

* [hub] order_by filters

* [hub] make hub category a tree

* [hub] enqueue batched item enqueueing

* [hub] requested products page

* [minor]

* update hub url

* [fix] url

* [fix] more reform

* fix recursion

* [hub] data migration plans as jsons

* Hub register, create data connector, sync with run

* [add] user registration by session user

* Removed hub_message

* Remove sync code from hub_settings

* Remove hub methods from item.py

* Update Hub Sync plan

* Hub unregister

* Update Hub connector on reregister

* Dont delete Hub Connector on unregister

* Enable hub on success response

* Add new hub whitelisted methods

* [hub] list working

* Hub register from hub page

* [hub] Add hub logo in desk icon, link to page

* [hub] hide page head on empty state

* [hub] make rfq

* [hub] push opportunity doc, poll for opportunity docs

* add fields to item mapping

* update hub mappings

* Make RFQ

* [hub] item, home routing

* Make rfq and send opportunity refactor

* [hub][fix] remote lead data

* images passed as base64

* set default company on register

* Revert "images passed as base64"

This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.

* Add sync to hub page

* Prompt for publish items to hub

* add post process to hub document to lead

* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +05:30
Makarand Bauskar
1b67d71139 [minor] add the Lead in email account -> append_to field () 2017-10-04 15:55:56 +05:30
Rushabh Mehta
4b99fe15cc [version] 9.x.x-develop 2017-09-30 11:41:26 +05:30
Nabin Hait
76e1ca35ad Merge branch 'master' into develop 2017-09-27 13:05:21 +05:30
Brown-Harry Boma
d3fa19143d Properly redirect supplier after quotations submit () 2017-09-27 12:53:38 +05:30
Prateeksha Singh
946e182564 install company fixtures while creating company ()
* install company fixtures while creating company

* [fix] remove from setup_complete
2017-09-27 11:44:39 +05:30
rohitwaghchaure
850eaa73b0 Move subscription module to accounts () 2017-09-18 17:23:00 +05:30
Manas Solanki
e716da04ec add the newsletter in the standard portel () 2017-09-18 16:00:34 +05:30
Rushabh Mehta
f056974bc5 [domain] Healthcare ()
* 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:  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
Nabin Hait
f8f29677fd Merge branch 'master' into develop 2017-09-12 16:16:57 +05:30
Nabin Hait
e5716e3b1e Default view of BOM is Listview 2017-09-11 19:21:47 +05:30
rohitwaghchaure
166b78f022 [Enhance] Subscription module ()
* [Enhance] Subscription module

* Added view documents from the subscription form

* Test cases

* documentation

* UI Test cases, fixes

* Removed child table in the subscription

* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow

* added patch to make subscription from the recurring data

* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller

* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Prateeksha Singh
95d8fd38f5 User Progress ()
* [user-progress] first cut

* [user-progress] Add users slide, remove taxes, make sample data

* wip tests

* [setup-wiz] UI test

* [user-progress] notif test, docs trim

* wip

* [user-progress] Setup Progress single to update action states, fixtures

* setup progress actions patch

* rename sales_target field patch

* [progress] wip reform slide data

* [progress] remove slide data

* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Nabin Hait
adbf8adfb9 Update BOM cost in all BOMs based on latest rm rate 2017-08-22 10:49:57 +05:30
Rushabh Mehta
dbb5154f37 Fixes in Order / Quotation ()
* Additions in Order Page for Sidebar Menu with "Order" page route

* Adjust Columns in order_taxes.html to avoid number breaks for more precisions

* Fields additions in transaction_row.html

* [fix] style for order pages, indicator for quotation etc

* [fix] style for order pages, indicator for quotation etc

* [test] add timeout
2017-08-10 21:06:09 +05:30
Faris Ansari
40d3ad2bb4 Add erpnext-grey.png, add logo in footer ()
* Add erpnext-grey.png, footer html

* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Britlog
4c7709efbd Portal breadcrumbs () 2017-07-28 18:54:22 +05:30
Vishal Dhayagude
edb2749dfd Timesheet web ()
* [new]Timesheet added

* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
bcornwellmott
96381da547 Supplier Scorecard ()
* Initial start of scorecard docs

* Got basic functionality working

* Fixed doc names and added key functions

* Basic functional version minus Actions

* Hide scorecard docs until functional

* Created supplier scorecard documentation

* Added default variables and standings. Added restrictions for PO + RFQ

* Automatic daily scorecard creation + on save

* Added warning for PO nd RFQs

* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo

* Added tests, fixed codacy formatting, small improvements

* Fixed test bug w/ criteria. Codacy cleanup

* Fixed codacy issues. Fixed sticky criteria

* Fixed bug with period search. Remove blank variable child.

* Updated docs, automatically add criteria and standings, clean up period create message

* Uncommented test, set docs to beta

* Fix for nabinhait review

* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Makarand Bauskar
9306aff1bb [minor] moved the patch to v8_5 and other minor fixes ()
* Quotation and Supplier Quotation Route and Permission Edits

* [minor] moved the patch to v8_5 and other minor fixes
2017-07-21 15:19:47 +05:30
Prateeksha Singh
e012e24423 Sales Goal by Company ()
* [sales goal] in company; dashboard, graph, notifs, wiz

* [test] target notifications

* cache past year monthly sales of every company daily, patch

* [minor] query fixes

* update sales goal docs
2017-07-18 10:35:12 +05:30
Nabin Hait
b962fc1573 Show hsn code in tax breakup for India and render via template ()
* Show hsn code in tax breakup for India and render via template

* tax breakup if gst_tax_field does not exists

* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
KanchanChauhan
319c58266b Changes Quotes to Quotations in website sidebar because that seems more legit () 2017-07-14 14:30:42 +05:30
Faris Ansari
2c5b3e83f5 New design for daily work summary ()
* New design for daily work summary

* Update tests
2017-07-13 18:37:18 +05:30
Rushabh Mehta
7231f29e78 [feature] override a function regionally by adding a decorator 2017-07-13 15:00:56 +05:30
creamdory
7a2815299e Added Quotation as Standard Sidebar Menu 2017-07-10 16:09:03 +08:00
Rushabh Mehta
b3c8f44b3e [wip] GST for India. Pending reports 2017-06-22 22:31:32 +05:30
KanchanChauhan
1dc26b127b Salutation and Gender in Lead and Customer () 2017-06-13 15:26:35 +05:30
Manas Solanki
253c53cf53 updating serial no status from scheduler () 2017-05-30 15:35:58 +05:30
Faris Ansari
1c09a991f3 Change beta_version to 8.x-beta ()
* Change beta_version to 8.x-beta

* change to 8.x.x-beta
2017-05-04 12:12:14 +05:30
Rushabh Mehta
0d6db6c42c [fix] add user default role 2017-03-31 23:02:19 +05:30
mbauskar
f54b1047b8 [minor] custom script to create issue, lead, opportunity from email 2017-03-14 17:57:47 +05:30
Saurabh
0d47d51407 [fix] modified payment request to cope with new payment structure ()
* [fix] modified payment request to cope with new payment structure

* [fix] moved payment gateway doctype from accounts to core
2017-03-14 14:46:05 +05:30
Rushabh Mehta
db206f2d10 [minor] develop_version 2017-03-10 09:39:31 +05:30
Rushabh Mehta
b9cdb05934 [minor] renamed portal hook 2017-03-08 12:34:03 +05:30
Nabin Hait
c642f76a4d Fixed merge conflict 2017-02-27 14:40:53 +05:30
Rushabh Mehta
05ce7ec7bb [enhance] desktop messages 2017-02-22 16:15:43 +05:30
Nabin Hait
391eca18c7 Fixed merge conflict 2017-02-20 19:38:22 +05:30
mbauskar
e1e25a0c9d [minor] auto close opportunity after 7 days 2017-02-17 14:54:50 +05:30
pratu16x7
dee36e10ae Add operations and items to website 2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20 Add template 2017-02-14 17:18:09 +05:30
Rushabh Mehta
a3d0bea375 Merge branch 'develop' into remove-party-status 2017-02-02 15:42:04 +05:30
Rushabh Mehta
4500f7b4d6 [cleanup] remove unused LMS () 2017-01-30 17:04:38 +05:30
Rushabh Mehta
87037bdd56 [minor] remove party status as it leads to duplicate notifications fixes , also fix for 2017-01-30 13:22:51 +05:30
mbauskar
51b1d6de48 [minor] moved the address_and_contact utils to frappe 2017-01-30 10:45:28 +05:30
Neil Trini Lasrado
38bd62d82d Merge branch 'develop' into assessment 2017-01-16 12:23:51 +05:30
Rushabh Mehta
95439db53f [fixes] address and contact 2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
robert schouten
7a3d418aa5 Email inbox based off of frappe email inbox pr ()
* email inbox

* inbox fixes

* separate email-inbox to pass tests

* separate email-inbox to pass tests

* fix import

* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
d40e661ebd [style] better demo start page 2017-01-10 14:46:54 +05:30
Neil Trini Lasrado
a56224c03a Rename Assessment to Assessment Plan 2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
577cfd559f Removed LMS code in Course master 2017-01-09 18:26:03 +05:30
Rushabh Mehta
2167ff589c [minor] update font awesome icons 2016-12-07 11:09:02 +05:30
Rushabh Mehta
9dd58d42df [fix] test cases and final wiring for daily work summary 2016-11-18 12:40:18 +05:30
Rushabh Mehta
fe816c3852 [fix] [wip] daily work summary 2016-11-18 12:40:18 +05:30
Nabin Hait
ceca1b97c3 Fixed merge conflict 2016-11-09 14:58:36 +05:30
Saurabh
94c666ae46 [fix] added hook call to create payment gateway account record 2016-11-08 20:35:50 +05:30
Rohit Waghchaure
2f1db57fe1 Added status field in sales invoice and purchase invoice 2016-11-08 18:49:58 +05:30
Rohit Waghchaure
3844d2cc01 Remember last selected value for link field 2016-11-03 14:49:27 +05:30
Rushabh Mehta
fc800b3f2f [enhance] added roles for portal users frappe/frappe#2091 () 2016-09-23 21:51:51 +05:30
Rohit Waghchaure
21499e820d [Enhancement] Supplier quotation added on supplier portal 2016-09-21 17:07:25 +05:30
Neil Trini Lasrado
83d81203b2 Added Student Admissions ()
* Added Student Admissions

* Fixes for Student Application
2016-09-15 14:48:13 +05:30
Nabin Hait
f44b5152d2 Portal settings for schools 2016-08-09 17:08:13 +05:30
Neil Trini Lasrado
50b2278eda Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch 2016-08-05 15:09:49 +05:30
Saurabh
e4e8954a19 [fix] make payment request without payment gateway 2016-07-22 15:43:26 +05:30
Neil Trini Lasrado
3f0a581b85 Merge ERPNext Schools into ERPNext 2016-07-20 19:25:02 +05:30
Rushabh Mehta
bc10431b7d Merge pull request from KanchanChauhan/address-viewww-fixed
Address view fixed for website
2016-07-04 15:50:40 +05:30
Kanchan Chauhan
1605ff02c6 [WIP] Address view fixed 2016-07-04 15:41:07 +05:30
Saurabh
621247807a [fix] BOM tree as default view 2016-06-30 15:05:06 +05:30
Rushabh Mehta
26a76fb2d9 Merge pull request from KanchanChauhan/moving-newsletter-to-frappe
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216 Newsletter moved to Frappe 2016-06-28 17:28:40 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Anand Doshi
f576f3b17b implemented get_site_info for erpnext and patch to move setup complete to system settings 2016-06-25 19:52:26 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Valmik Jangla
2225decb2b Restrict Newsletter lists 2016-06-15 16:04:17 +05:30
Anand Doshi
227b238fb1 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:31:01 +05:30
Rushabh Mehta
e778e59e4c [minor] always show issues in sidebar 2016-06-08 15:34:54 +05:30
Nabin Hait
3bc300a207 Merge branch 'master' into develop 2016-06-03 11:57:30 +05:30
Nabin Hait
ef7b6ab8ef bumped to version 6.27.22 2016-06-03 12:20:19 +06:00
Nabin Hait
1ade5927c4 fixed conflict 2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc bumped to version 6.27.21 2016-05-26 17:25:34 +06:00
Nabin Hait
310d64d565 Fixed conflict 2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497 bumped to version 6.27.20 2016-05-26 16:15:34 +06:00
Nabin Hait
66ee4d8cd7 Merge branch 'master' into develop 2016-05-20 15:15:21 +05:30
Nabin Hait
a54a2a99f4 bumped to version 6.27.19 2016-05-20 15:45:20 +06:00
Nabin Hait
563bd056d7 Merge branch 'master' into develop 2016-05-20 12:18:28 +05:30
Nabin Hait
6c5a9bbe6b bumped to version 6.27.18 2016-05-20 12:48:27 +06:00
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
a1fcded0ba bumped to version 6.27.17 2016-05-11 13:13:39 +06:00
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
42800d24cc bumped to version 6.27.16 2016-05-06 16:43:34 +06:00
Nabin Hait
f3bff49799 Merge branch 'master' into develop 2016-05-02 15:19:17 +05:30
Nabin Hait
d824fbbddd bumped to version 6.27.15 2016-05-02 15:49:16 +06:00
Rushabh Mehta
764aa92da4 [minor] added remember_selected in hooks and doc update 2016-05-02 13:28:59 +05:30
Nabin Hait
b78adcf279 Merge branch 'master' into develop 2016-04-29 18:26:46 +05:30
Nabin Hait
ab7f6870cb bumped to version 6.27.14 2016-04-29 18:56:45 +06:00
Nabin Hait
6146cc1e33 Merge branch 'master' into develop 2016-04-29 11:44:55 +05:30
Nabin Hait
cfe14d9814 bumped to version 6.27.13 2016-04-29 12:14:54 +06:00
Anand Doshi
79c536acb5 Merge branch 'master' into develop 2016-04-27 15:44:11 +05:30
Anand Doshi
08de396d46 bumped to version 6.27.12 2016-04-27 16:13:21 +06:00
Anand Doshi
e3bd78e912 [css] portal 2016-04-22 18:53:21 +05:30