Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,822 Commits 3 Branches 0 Tags 1 GiB
64c1347d1e
Commit Graph

617 Commits

Author SHA1 Message Date
Britlog
4412f10918 Add missing fields in select, the same as in get_product_list_for_group (#14789) 2018-07-03 10:33:49 +05:30
Prateeksha Singh
34aeefc0a1 [fix] yet another python attribute fetch 2018-06-26 12:18:29 +05:30
Prateeksha Singh
9a138f07f7 [portal] fix item-preview column #13077 2018-06-21 22:42:03 +05:30
Prateeksha Singh
8d58429b69 [help-portal] don't show issues to guest 2018-06-12 17:39:12 +05:30
Sushant Nadkar
d458f7710f [UX Improvement] Removed uri encoding from search results on front end (#14266) 
* removed uri encoding from search results on front end

* decode search string using html2text
 2018-06-06 09:23:38 +05:30
Sushant Nadkar
565bf203e5 [Improvement] Added display settings for item price, availibility and stock levels (#14308) 
* display item price on website even when cart is disabled

* added display settings for item price, availibility and stock levels

* Update shopping_cart_settings.json
 2018-06-05 10:43:11 +05:30
Prateeksha Singh
66425c6e7f [fix] help page issue listing 2018-05-30 17:26:03 +05:30
Achilles Rasquinha
efb731941d ran 2to3, evaluation (#13499) 
* ran 2to3, evaluation

* Update update_gstin.py

* Update accounts_receivable_summary.py
 2018-05-23 11:31:24 +05:30
Prateeksha Singh
b44ea4c8dc [website] Support Portal (#14144) 
* [init] support portal

* [support-portal] Get started sections and forum activity

* [support-portal] integrate API search for forums, docs, etc

* [support-portal] integrate doctype docs search via global search

* [support-portal] /help page UI
 2018-05-22 11:57:21 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Manas Solanki
661332dab5 [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
Faris Ansari
69b0535e10 [fix] Incorrect currency conversion in Itemised Tax Breakup (#14006) 2018-05-14 14:19:31 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Prateeksha Singh
6855b87f76 [fix] featured product thumbnail 2018-04-25 13:03:11 +05:30
tundebabzy
caae0f4dcc Merge branch 'develop' into new-subscription 2018-04-17 09:34:04 +01:00
Britlog
e3a9b9fe49 [Website] Price in items list and sales uom management (#13335) 
* Price in items list and sales uom management

* Price in product search page

* Display website stock in sales uom

* Add set_product_info_for_website to avoid duplicate code

* Add price uom in item list and page

* Update product.py
 2018-03-20 14:28:44 +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
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008) 
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
 2018-03-01 10:59:21 +05:30
Shreya Shah
a310cc7156 order by modified instead of item name (#13113) 2018-02-28 18:59:55 +05:30
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128) 
* Use range instead of xrange

* convert float to int
 2018-02-28 16:12:51 +05:30
Ameya Shenoy
3ee22f0137 rename valid_email to validate_email (#13103) 2018-02-27 12:59:12 +05:30
Nabin Hait
e55831a89c Projected Qty in Auto reorder email 2018-02-26 11:38:40 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Faris Ansari
7c744acc49
Changes for Rollup (#12924) 
* Changes for rollup

* remove variables.less
 2018-02-20 14:21:50 +05:30
Vishal Dhayagude
a5003f8f5b [minor] Balance Qty added in reorder level email notification (#13000) 2018-02-20 11:14:54 +05:30
Britlog
be9a7231d4 Fix bootstrap layout and move checkout button upper (#12063) 2018-02-12 11:28:57 +05:30
Saurabh
9f29f60707
Merge pull request #12581 from britlog/website-product-spinner 
[Website] Add number spinner for quantities in product page
 2018-01-31 15:58:04 +05:30
britlog
d13985d1d0 Add number spinner for quantity 2018-01-19 18:31:25 +01:00
Umair Sayed
230805b016 Update total.html (#12511) 2018-01-17 14:41:38 +05:30
Vishal Dhayagude
eec0f7fd6b [non_profit][fix] Chapter listing and join and leave chapter issue (#12463) 
* [fix] Chapter listing and Join and leave chapter issue

* [minor] Changes in chapter html, chapter title to chapter name
 2018-01-15 14:10:23 +05:30
rohitwaghchaure
bf4c114c58 [Enhance] Provision to show inclusive tax in print (#12345) 
* [Enhance] Provision to show inclusive tax in print

* POS Print format
 2018-01-08 15:20:15 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30
Vishal
474d58cecf [fix] minor changes 2017-12-05 17:19:02 +05:30
Vishal
a72a3bd536 [new] Chapter Module clean up after review 2017-12-05 16:41:09 +05:30
Charles-Henri Decultot
8a052cb153 Translation issue (#11833) 2017-12-04 11:17:05 +05:30
Charles-Henri Decultot
e90a1caeb1 Portal print format correction (#11812) 
* Portal print format correction

* Correction following Rushabh's comment
 2017-12-01 16:19:45 +05:30
Britlog
2a89a502f0 [Website] Items list and stock (#11480) 
* Add stock availability in items list and a parameter to set the number of products per page

* Substract reserved_qty from actual_qty for website stock
 2017-11-17 11:41:07 +05:30
Rushabh Mehta
a5ebebd09c
[enhance] Add Issue Type and Opportunity Type masters (#11598) 
* [enhance] added & linked Issue Type & Opportunity Type with opportunity

* [patch] create issue and opportunity type from the custom field if available

* [minor] issue_type and opportunity type should be mandatory

* [patches] removed try catch from the patch

* [fix] patch

* [refactor] cleanup issue/opportunity type
 2017-11-16 17:03:52 +05:30
Nabin Hait
cd3dbcb2ef Fixed Merge Conflict 2017-10-25 14:07:25 +05:30
rohitwaghchaure
3dc21b099d [Fix] Translation issue (#11323) 2017-10-25 12:38:17 +05:30
Neil Trini Lasrado
1f99bea6ce Pass sender as contact email in Opportunity (#11308) 
Always pass sender as the contact email while creating an opportunity for a website enquiry.
 2017-10-25 11:44:12 +05:30
Faris Ansari
fd345f8e90 Hub (#10934) 
* [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
Francisco Roldán
1b61dfd9ea translated (#10886) 2017-09-29 15:19:12 +05:30
Brown-Harry Boma
d3fa19143d Properly redirect supplier after quotations submit (#10903) 2017-09-27 12:53:38 +05:30
rohitwaghchaure
850eaa73b0 Move subscription module to accounts (#10772) 2017-09-18 17:23:00 +05:30
mbauskar
ea832b8157 resolved merge conflicts 2017-09-14 15:32:10 +05:30
Nabin Hait
45dce89cae Print Settings for printing taxes with zero amount (#10782) 
* Print Settings for printing taxes with zero amount

* added __init__.py file to patch module v8_9
 2017-09-14 15:17:38 +05:30
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
Nabin Hait
f8f29677fd Merge branch 'master' into develop 2017-09-12 16:16:57 +05:30
Nabin Hait
c9e96c15af Rate and amount in a single row in tax breakup 2017-09-12 15:45:49 +05:30
Faris Ansari
425f1df799 [fix] Tax area alignment (#10690) 2017-09-08 15:56:34 +05:30
Faris Ansari
8868ae22be [fix] Tax area alignment (#10690) 2017-09-06 12:17:12 +05:30
Saurabh
21833413b0 [fix] ERPNext signup link fix on demo page (#10649) 2017-09-04 10:15:24 +05:30
Nabin Hait
baacf51a00 Fixed merge conflict 2017-09-04 10:13:29 +05:30
Nabin Hait
e7e29b7f10 GST print format for POS (#10590) 
* Serial no added in GST tax invoice

* GST print format for POS
 2017-08-31 15:06:12 +05:30
Faris Ansari
b9939a6449 Merge pull request #10448 from joelios/selfpostback 
improvement for self-postbacks
 2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2 handle both cases 2017-08-29 14:02:49 +05:30
Aditya Hase
6ccb6562f1 Python 3 compatibility syntax error fixes (#10519) 
* Use Python 3 style print function

* Use 'Exception as e' instead of 'Exception, e'

* Unpack tuple arguments explicitly in instead of relying on auto unpacking

* Use consistent indentation

* Use 0 if stock_frozen_upto_days is None
 2017-08-28 18:17:36 +05:30
mbauskar
aaec42ebc2 resolved merged conflicts 2017-08-28 11:57:56 +05:30
Nabin Hait
caab582943 Tax breakup for actual amount and fixes in itemised purchase register (#10515) 
* Tax breakup for actual amount and fixes in itemised pur register

* Rounding of itemised tax breakup amount
 2017-08-24 16:22:28 +05:30
Joel Mesmer
97c1bcf14f improvement for self-postbacks 2017-08-17 22:20:18 +02:00
Rushabh Mehta
1fe1a47658 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
550b0fab84 [fixes] email notifications by email alert on training event and result 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
94c6b7409b Updated documentation 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e9dbafcc10 Improve email format for training event, add ui test 2017-08-14 11:53:34 +05:30
Rushabh Mehta
dbb5154f37 Fixes in Order / Quotation (#10361) 
* 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
Saurabh
3a4b6c2cba [fix] redirect to payment url if paying via web portal (#10265) 
* [fix] redirect to payment url if paying via web portal

* [fix] test case fix

* [fix] test case fixes
 2017-08-08 11:29:11 +05:30
mbauskar
2dd57acdef removed merge conflicts 2017-08-02 18:39:04 +05:30
Faris Ansari
578624db1f Fix column width in GST Tax Breakup (#10230) 2017-08-02 17:44:32 +05:30
Britlog
4c7709efbd Portal breadcrumbs (#10095) 2017-07-28 18:54:22 +05:30
Rushabh Mehta
bead70b43a Docs in website (#10149) 
* [docs] move to erpnext.org

* [docs]

* [minor] add title
 2017-07-28 11:44:08 +05:30
Faris Ansari
fbec103ae7 Remove inline styling, add css classes (#10077) 2017-07-26 18:46:13 +05:30
Vishal Dhayagude
edb2749dfd Timesheet web (#10037) 
* [new]Timesheet added

* [new] Customer wise timesheet on webportal added
 2017-07-25 10:53:12 +05:30
Faris Ansari
e355f99786 Remove ellipsis in title and description (#9992) 2017-07-20 17:51:19 +05:30
Nabin Hait
b962fc1573 Show hsn code in tax breakup for India and render via template (#9866) 
* 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
Faris Ansari
2c5b3e83f5 New design for daily work summary (#9844) 
* New design for daily work summary

* Update tests
 2017-07-13 18:37:18 +05:30
Nabin Hait
0a32b7a6eb Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code 2017-07-12 19:21:05 +05:30
Nabin Hait
fa351f4bdf Merge pull request #9433 from tundebabzy/issue-9424 
Errors due to a single quote in Supplier's name #9424
 2017-07-06 15:22:16 +05:30
mbauskar
ec252c806f resolved merge conflicts 2017-06-29 12:11:07 +05:30
Makarand Bauskar
a938d3956a [minor] get doc using party_name instead of party 2017-06-29 11:58:50 +05:30
Rushabh Mehta
02b0ed4199 [fix] update-gstin 2017-06-29 11:56:14 +05:30
Sagar Vora
1ef50c89db [minor] use party_name instead of party and save GSTIN in uppercase 2017-06-28 23:52:22 +05:30
Makarand Bauskar
104eb8c6ad [minor] render GSTIN value as "" instead of None 2017-06-27 18:59:35 +05:30
Rushabh Mehta
00ae424cac [regional] ability to send gst reminders to all parties 2017-06-27 17:31:41 +05:30
tunde
dcd54209fc parameterises sql string 2017-06-22 14:03:19 +01:00
Makarand Bauskar
8fac4314aa Merge pull request #9373 from sagarvora/gh-9289 
Check for align_labels_left before adding text-right class
 2017-06-20 14:31:22 +05:30
Sagar Vora
89d60ca35e Check for align_labels_left before adding text-right class 2017-06-20 14:16:06 +05:30
Britlog
faf75c4ddd Fix and improve shopping cart (#9348) 
* Fix and improve shopping cart

* Update shopping_cart.js

* Update shopping_cart.js
 2017-06-20 12:51:32 +05:30
Nabin Hait
d0ac0bdc18 Merge branch 'master' into develop 2017-06-12 13:50:12 +05:30
Makarand Bauskar
665311b38a [hotfix] replaced __ call with _ in project_timesheets.html (#9198) 2017-06-09 14:03:20 +05:30
Nabin Hait
2c808c578d Merge branch 'master' into develop 2017-06-08 10:34:45 +05:30
rohitwaghchaure
6b95210c19 [Fix] User not able to view projects from the portal (#9173) 2017-06-07 20:03:37 +05:30
Faris Ansari
5f27c94100 Merge pull request #9078 from netchampfaris/remove-globals 
Lint and fix JS files
 2017-06-06 11:35:42 +05:30
Britlog
495a408db0 Fix contact form if email is both customer and lead (#9075) 2017-06-01 19:08:04 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Nabin Hait
889e456dab Merge branch 'master' into develop 2017-05-23 12:04:06 +05:30
Faris Ansari
2424aa73d7 Fix translated string in jinja (#8956) 2017-05-22 13:09:36 +05:30
Charles-Henri Decultot
2de1cd3529 View Attachments in portal (#8830) 
* View Attachments in portal

* HTML beautify correction

* Move option to shopping cart settings

* new field in shopping cart settings for public attachments display in portal
 2017-05-19 16:04:10 +05:30
KanchanChauhan
32cbbe5cc2 Website Specification Labls should not be capitalised by default (#8798) 2017-05-19 15:14:31 +05:30
Francisco Roldán
85bfc05efa Fix missing translations (#8871) 
* Fix missing translations

* Fix
 2017-05-17 19:42:04 +05:30
Saurabh
62c7deee00 [fix] don't allow string values in limits to avoid sql injection (#8779) 2017-05-11 18:03:12 +05:30
Kanchan Chauhan
0633df5872 Item variant searchable in website products 2017-04-19 20:51:43 +05:30
mbauskar
22cedeb006 [minor] POS & RFQ format_number fixes 2017-04-17 12:24:24 +05:30
mbauskar
ed8ad9cfee [minor] fides for add to card button issue 2017-04-13 18:45:09 +05:30
mbauskar
9a0efc7710 [minor] validate email address before get update button click 2017-04-13 18:18:18 +05:30
Rushabh Mehta
66272a168d [minor] README.md + encode query parameter in search 2017-04-12 14:32:07 +05:30
Rushabh Mehta
9365641777 [added] frappe.safe_eval 2017-04-06 18:24:34 +05:30
Nabin Hait
00b04ed61e Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart 
Show qty in Shopping Cart
 2017-03-24 13:14:03 +05:30
Kanchan Chauhan
a844040781 Show qty in Shopping Cart 2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44 [minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type 2017-03-23 13:43:26 +01:00
Robert Kirschner
d162eb367c [minor] fix translation strings in cart web view 2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2017-03-23 12:10:46 +01:00
mbauskar
67e3e32dd6 [minor] fixed shipping and billing address issue in cart 2017-03-22 16:14:43 +05:30
Robert Kirschner
c6b52a321e update on cart.js pull request feedback 2017-03-22 08:10:30 +01:00
Robert Kirschner
0a33d4ffc5 [fix] selecting new address in cart web page unchecks previously checked address 2017-03-21 14:52:59 +01:00
Nabin Hait
2bcacec5c6 Merge pull request #7576 from RobertSchouten/compact_dev 
[fix] compact print format not longer ignores format builder
 2017-02-24 13:09:18 +05:30
Nabin Hait
391eca18c7 Fixed merge conflict 2017-02-20 19:38:22 +05:30
Makarand Bauskar
98f9427ba1 [minor] minor fixes for contact us page 2017-02-20 12:41:48 +05:30
Nabin Hait
ea1cb68fe7 Merge branch 'master' into develop 2017-02-16 14:37:50 +05:30
pratu16x7
86415f394d [minor] duration bar 2017-02-16 09:27:53 +05:30
pratu16x7
462e89e452 [minor] margin fix 2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4 Mobile view fixes 2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90 Website data from existing child tables, layout, images 2017-02-14 17:18:09 +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
Kanchan Chauhan
1cd5e583ba [Fix] Apply Now button redirect fixed for Job Opening 2017-02-10 17:58:41 +05:30
Rushabh Mehta
4500f7b4d6 [cleanup] remove unused LMS (#7612) 2017-01-30 17:04:38 +05:30
robert schouten
67eff49516 [fix] compact print format not longer ignores format builder 2017-01-25 08:20:43 +08:00
rohitwaghchaure
ab65f6d8b1 Merge pull request #7547 from mnatalia/develop 
Added translations to the web page and item dashboard.
 2017-01-23 15:57:33 +05:30
Rushabh Mehta
397e508fc0 [fix] sales_partner.js, fixes #7553 2017-01-21 16:58:57 +05:30
mnatalia
e09407571c Added translations to the web page and item dashboard. 2017-01-20 12:00:25 +02:00
Felipe Orellana
ac81440a81 [FIX] Contact form breaks on existing lead 
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
 2017-01-12 12:08:20 -05:00
Rushabh Mehta
d40e661ebd [style] better demo start page 2017-01-10 14:46:54 +05:30
Nabin Hait
d08c248642 Merge pull request #7354 from Scheercuzy/enlarge-item-image-website 
Hyperlink on item image on website
 2017-01-04 15:58:44 +05:30
Kanchan Chauhan
b7cc393eb8 Email ID renamed to Email Address 2017-01-03 16:45:38 +05:30
Scheercuzy
7c161cfff2 Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website 2017-01-03 16:03:43 +06:30
KanchanChauhan
4601fdd98d Better Salary Slip logs in Process Payroll (#7322) 2016-12-30 16:26:55 +05:30
Scheercuzy
f483582957 Hyperlink Item Image 
added hyperlink on item image
 2016-12-29 18:56:44 +06:30
Rushabh Mehta
5cb1b6bf3f [minor] translation fix 2016-12-27 16:30:20 +05:30
Rushabh Mehta
827588adf2 [minor] fixes to job opening 2016-12-19 17:06:26 +05:30
Rushabh Mehta
99c814b360 [fix] paging for products (support) 2016-12-19 11:55:10 +05:30
Rushabh Mehta
86f8ab95f6 [minor] font-awesome fixes 2016-12-05 15:02:24 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Kanchan Chauhan
2c1f399479 Apply Pricing Rule in Shopping Cart 2016-11-22 22:23:31 +05:30
Nabin Hait
46753de6d7 fixed merge conflict 2016-11-17 15:55:11 +05:30
Kanchan Chauhan
98f499a43e [Fix]Product thumbnail in Shopping Cart 2016-11-16 15:17:55 +05:30
Rushabh Mehta
4bfa0748cd [merge] master 2016-11-16 11:28:23 +05:30
Rushabh Mehta
d51e1587d5 [fix] contact us page should create a opportunity by default (#6939) 2016-11-16 11:13:31 +05:30
Rushabh Mehta
440650d4a2 [fix] view shopping cart dropdown (#6928) 2016-11-14 13:13:53 +05:30
Rushabh Mehta
e855f53f08 [minor] fix ellipsis style 2016-11-02 07:34:17 +05:30
Nabin Hait
0702fa2fc6 Fixed version conflict 2016-10-19 16:49:36 +05:30
Faris Ansari
2acbb11923 [fix] print format image size 2016-10-19 12:08:00 +05:30
Rushabh Mehta
257bbbe588 [refactor] has_website_permission parameters 2016-10-12 10:53:34 +05:30
Rushabh Mehta
ac5b193100 [minor] direct student admission to the list page 2016-10-09 15:19:23 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
7c0fe7d9d3 Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations 
[Enhancement] Added supplier quotation link on rfq
 2016-10-05 15:44:51 +05:30
Rohit Waghchaure
a26f685b9f [Enhancement] Added supplier quotation link on rfq 2016-10-05 15:04:50 +05:30
Nabin Hait
7229b64128 Merge pull request #6516 from bcornwellmott/patch-6 
Update request_for_quotation.html
 2016-10-05 13:12:09 +05:30
Rushabh Mehta
3af3d7abe3 [fixes] admission-applicant link and student applicant fixes 2016-10-04 12:20:47 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Nabin Hait
7fb79d175f Fixed version conflict 2016-10-03 18:05:34 +05:30
Faris Ansari
69ca382529 [fix] image size fix in print format 2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573 Merged introduction and eligibility into a single text field in Student Admission. (#6529) 2016-10-03 15:50:47 +05:30
bcornwellmott
47863a3049 Update request_for_quotation.html 
Fixing spelling mistakes
 2016-09-30 15:45:20 -07:00
Rushabh Mehta
2d4f3bb04a [fix] space 2016-09-22 15:17:04 +05:30
Rohit Waghchaure
21499e820d [Enhancement] Supplier quotation added on supplier portal 2016-09-21 17:07:25 +05:30
Nabin Hait
0be6073f10 Fixed version conflict 2016-09-21 13:06:19 +05:30
Nabin Hait
429a38f90b Merge pull request #6415 from rmehta/hotfix 
[minor] bring back old grid style in material request
 2016-09-20 18:05:32 +05:30
Rushabh Mehta
57a1905576 [minor] bring back old grid style in material request 2016-09-20 17:22:54 +05:30
Neil Trini Lasrado
bb5eb7d6f4 Added title to Student Admission (#6379) 2016-09-15 16:44:25 +05:30
Neil Trini Lasrado
7e1b516103 fixes for student admission (#6377) 
* fixes for student admission

* Added Application Route to Student Admission
 2016-09-15 15:36:14 +05:30
Neil Trini Lasrado
83d81203b2 Added Student Admissions (#6359) 
* Added Student Admissions

* Fixes for Student Application
 2016-09-15 14:48:13 +05:30
Nabin Hait
d5ebd79ad7 Fixed version conflict 2016-09-14 15:50:22 +05:30
Rushabh Mehta
b6bca567ce [fixes] [style] for web-form 2016-09-13 14:40:13 +05:30
Nabin Hait
9c82dd9157 Merge pull request #6332 from rmehta/item-group-paging 
[fix] paging for item group
 2016-09-12 13:01:54 +05:30
Rushabh Mehta
3aa315040f [fix] paging for item group 2016-09-11 16:48:24 +05:30
Rohit Waghchaure
b34ba6bd6e [RFQ] Web form alignment issue 2016-09-01 19:10:58 +05:30
Rushabh Mehta
9d1b56f423 [minor] validate permission in Process Payroll and all products fix for home page 2016-08-29 11:03:10 +05:30
Revant Nandgaonkar
5bbc68df8b [fix] Issue #6046 group_name replaced with name 2016-08-10 11:06:31 +05:30
Rushabh Mehta
ec2d09c557 [minor] setting up website optional in setup wizard 2016-08-09 16:44:37 +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
Rushabh Mehta
ea5ad84c5e [minor] fix image for demo 2016-08-02 21:26:04 +05:30
Neil Trini Lasrado
3f0a581b85 Merge ERPNext Schools into ERPNext 2016-07-20 19:25:02 +05:30
Anand Doshi
d9b3c5ca60 [fix] use base.html's title block in home.html 2016-07-13 11:29:50 +05:30
Kanchan Chauhan
6d76359c31 [WIP] Task statuses updated in website 2016-07-07 12:19:01 +05:30
Rohit Waghchaure
f154c611bb [Fixes] RFQ contact and multiple creation of supplier quotation issue 2016-07-06 17:26:15 +05:30
Rushabh Mehta
bc10431b7d Merge pull request #5631 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
Rushabh Mehta
5f5f0bec2c [fix] buttons for rfq and material request 2016-07-04 11:39:25 +05:30
Rushabh Mehta
dc8067eb33 [demo] new cleaner, more-flexible demo 2016-07-04 11:39:25 +05:30
Rushabh Mehta
878dfec46a [minor] 2016-07-04 11:39:25 +05:30
Kanchan Chauhan
a756e3f765 Reverted changes 2016-06-28 15:02:35 +05:30
Kanchan Chauhan
c8d47da6bc Shopping cart and dropdown cart update 2016-06-28 11:29:43 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Anand Doshi
771ab0c8c3 [fix] [patch] re-route 2016-06-27 12:04:48 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Saurabh
ed0816832d [enhance] ux fixes for payment request, added jinja for payment request message 2016-05-25 11:55:30 +05:30
Rushabh Mehta
ac123c57f3 [cleanup] website / portal css 2016-05-20 16:37:14 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rushabh Mehta
35047ac283 [ux] direct editing in material request 2016-05-18 18:17:38 +05:30
Rushabh Mehta
6471e178f6 Merge pull request #5321 from rohitwaghchaure/rfq_fixes 
[Fixes] RFQ minor fixes
 2016-05-16 11:57:35 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
Kanchan Chauhan
1d79f350bc Shopping Cart error messages issue resolved 2016-05-10 17:19:47 +05:30
Kanchan Chauhan
b3573a881e Shopping cart dropdown changes 2016-05-09 12:30:58 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Anand Doshi
a6f48688bc [enhancement] website: optionally show products as list 2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912 [css] portal 2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46 Website Changes 2016-04-22 17:47:16 +05:30
Rushabh Mehta
c291ab64a6 Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext 
[WIP] No not merge
 2016-04-21 11:39:45 +05:30
Rushabh Mehta
f2c3cb85a9 Merge pull request #5164 from KanchanChauhan/project-permissions 
Collaborate PM permission fixes and daily tme log fix
 2016-04-21 11:37:31 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Kanchan Chauhan
2dbf5294a9 [WIP] No not merge 2016-04-20 16:24:24 +05:30
Rohit Waghchaure
ae270d6648 [Fixes] Supplier can view their addresses, default buying price list issue 2016-04-11 13:58:33 +05:30
Kanchan Chauhan
a4ff5d3195 Collaborate PM permission fixes and daily tme log fix 2016-04-08 23:22:04 +05:30
Anand Doshi
e6e7cd90c9 Merge pull request #5143 from KanchanChauhan/somefixes 
[Minor Fixes] Findings in setting up erpnext
 2016-04-08 16:20:11 +05:30
Kanchan Chauhan
017d30f465 [Minor Fixes] Findings in setting up erpnext 2016-04-06 19:28:50 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
rohitwaghchaure
62fea0374b [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party 2016-03-31 21:49:07 +05:30
Rushabh Mehta
cb144bfcd4 [cleanup] projects 2016-03-31 14:27:35 +05:30
Rushabh Mehta
2d985e1973 [fix] edit-profile in frappe; 2016-03-30 17:15:33 +05:30
Rushabh Mehta
df7e523c3f [fix] web forms for collaborative pm 2016-03-30 11:00:42 +05:30
Rushabh Mehta
8b43fd7f02 Merge pull request #5084 from KanchanChauhan/PM-UI-Edits 
UI Changes
 2016-03-29 18:45:58 +05:30
Kanchan Chauhan
b566d42d37 UI Changes 2016-03-29 18:21:59 +05:30
Rushabh Mehta
7a1b5da830 [cleanup] request for quotation cleanup 2016-03-29 16:04:43 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
Rushabh Mehta
d5bf8253da [fix] job application link, fixes #5066 2016-03-28 11:30:05 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
Kanchan Chauhan
53ce94f9bd Minor fixes 2016-03-25 12:04:54 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Kanchan Chauhan
e14389ec6e Added task and issue webforms and few fixes 2016-03-23 14:14:38 +05:30
Anand Doshi
1947b1784e [minor] removed typo in order.html 2016-03-23 12:12:41 +05:30
Kanchan Chauhan
2ad801cfd8 Minor Updates 2016-03-22 16:00:41 +05:30
Kanchan Chauhan
b3fe6a45a7 WIP Collaborative Project Management first commit 2016-03-16 18:34:33 +05:30
Nabin Hait
6c3cc3647b Merge pull request #4969 from rmehta/link-count 
[enhancement] sort links on basis of link_count (idx)
 2016-03-15 11:40:18 +05:30
Anand Doshi
ad61a28730 [fix] [hot] compact print: check in_format_data for print format builder prints 2016-03-14 18:20:48 +05:30
rohitwaghchaure
bea7558908 [fixes]indicator in material request item 2016-03-14 17:47:36 +05:30
Rushabh Mehta
3574b37ff3 [enhancement] sort links on basis of link_count (idx) 2016-03-11 14:33:04 +05:30
Rushabh Mehta
07263462f6 [minor] add translated get_formatted 2016-03-03 10:48:45 +05:30
Rushabh Mehta
fe6eadfe22 [cleanup] job opening and job applicant 2016-03-02 12:53:19 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
ae7dc31d14 Merge pull request #4846 from KanchanChauhan/job-applicant 
Added feature to allow people to apply for job from website
 2016-02-29 17:22:01 +05:30
Nabin Hait
a1d5494fb3 Merge pull request #4867 from KanchanChauhan/item-group 
Added pagination to Products web page
 2016-02-25 11:56:30 +05:30
Kanchan Chauhan
0d6db633f7 Added pagination to Products web page 2016-02-24 17:29:25 +05:30
Saurabh
f54be2c7f0 [fixes] test case fixes for multi-currency check 2016-02-24 15:07:25 +05:30