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

984 Commits

Author SHA1 Message Date
KanchanChauhan
2d1cbd0b2e Delete old asset doctypes from Accounts module and minor changes (#11766) 2017-11-29 16:03:00 +05:30
Nabin Hait
46e285efe9 Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery 2017-11-29 14:15:16 +05:30
Julian Robbins
d785e22211 Fix spelling of accessibility (#11765) 2017-11-29 10:49:12 +05:30
Nabin Hait
cf9573ab2f Removed asset doctypes files from accounts module and patches 2017-11-28 16:56:53 +05:30
Kanchan Chauhan
e58a41a8a2 Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
Charles-Henri Decultot
22641e44ad Allowing the creation of an Oganization as Lead (#11724) 
* Allow the creation of an organization lead

* Changes following test fails

* Test case correction
 2017-11-27 11:58:22 +05:30
Manas Solanki
966f141f62 Rename schools to Education (#11524) 
* renaming for the docs, demo data and patch

* changes in the doctypes and reports

* rename the config file

* Few name changes in messages and license

* rename the school settings to education settings

* changes in the documentation

* added the setup file for the fixtures

* corrected the ui tests file path

* fix the codacy

* add the patch for renaming few doctypes and fields

* changes in the patch
 2017-11-23 15:22:10 +05:30
tundebabzy
acccdb3890 Default batch number selection (#11454) 
* fetch batch_no in `get_basic_details`

* PEP8 changes and docstring

* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch

* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out

* fetch batch number in `get_basic_details` using FEFO

* add new function - `set_batch_number`

* `set_batch_number` when `qty` is triggered

* `set_batch_number` when `uom` is triggered

* whitelist `get_batch_no_fefo`

* code clean up

* move `set_batch_number` to conversion_factor instead of uom

* rename `get_batch_no_fefo` to `get_batch_no`

* fix test case

* final cleanup

* Revert "fetch batch_no in `get_basic_details`"

This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3.

* fix test case

* update Sales Invoice manual

* move changes away from `transaction.js`

* query should not fetch expired batches

* refactor `get_batch_no`:
add new function `get_batches`

* Update batch.py
 2017-11-23 13:05:15 +05:30
Nabin Hait
32a62a02df Fixed merge conflict 2017-11-21 20:18:03 +05:30
creamdory
fd1503c6a5 [New Feature] Delivery 2017-11-20 10:28:49 +08:00
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) 
* Shipping rule for Buying

* [refactor] shipping rule
 2017-11-17 14:31:09 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
Nabin Hait
46be9896a9
Account number in chart of accounts (#10551) 
* Account number in chart of accounts

* Include account number while renaming account

* Test case fixed

* Standard coa with and without numbers

* Standard coa with and without numbers
 2017-11-16 16:51:55 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool (#11589) 
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices

* [minor] added progress bar while creating invoice

* [minor] allow bulk upload for the invoices

* [minor] calculate item rate from net total

* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0

* [minor] check mandatory values before making opening invoices

* [minor] enable primary button if there is any error while creating invoices

* [minor] minor fixes, set company currency as invoice currency added tests

* [dashboard] added Opening Invoice Summery section in Dashboard

* [minor] added total invoices count on dashboard

* [minor] don't show dashboard if there are no opening invoices available

* [minor] added Opening Invoice Tools to Account's Tools section

* [minor] codecy fixes

* [fix] refactored general ledger and buttons on charts

* [fix] tests
 2017-11-15 16:29:53 +05:30
Rushabh Mehta
cc1262c36d
Add option to clean description html in item description. (#11565) 
* [fix] add item settings

* [docs] Item Settings

* [fix] enqueue in item_settings.py

* [refactor] move to stock settings

* [refactor] move to stock settings
 2017-11-14 16:36:25 +05:30
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
Faris Ansari
c83413134d Merge pull request #11294 from revant/map_field_docs 
[Docs] added field for storing map
 2017-10-26 17:19:46 +05:30
Narciso E. Núñez Arias
47caf51efe [docs] Translate the Projects section of the Manual to Spanish (#11319) 
* [docs] Translate projects module. Add index page

* [docs] Translate activity cost page from projects module.

* [docs] Translate activity type page from projects module.

* [docs] Translate the Project Costing article in project module

* [docs] Translate the Project page in projects module

* [docs] Translate the Task page in projects module

* [docs] Translate the Time Log Batch page in projects module
 2017-10-25 11:53:10 +05:30
Revant Nandgaonkar
f8006b140f [Docs] Map field renamed to Geolocation 2017-10-25 11:18:29 +05:30
tunde
c8d2361b81 Merge branch 'develop' into payment-terms 2017-10-24 12:25:29 +01:00
Revant Nandgaonkar
010f619ed3 [Docs] added field for storing map 
related PR https://github.com/frappe/frappe/pull/4327
 2017-10-23 17:25:52 +05:30
Doridel Cahanap
5a4d5bfaf2 Add Training Program DocType, Script, Path and Doc (#11181) 
* Add Training Program Doctype, Script, Config and documentation

* Add Training Program to Training Event

* [Test Case] Training Event in a Training Program
 2017-10-20 11:31:15 +05:30
tunde
09ce68ec19 Merge branch 'develop' into payment-terms 2017-10-19 17:47:31 +01:00
jigneshpshah
bad5e90e46 Priority of credit limit check functionality (#11232) 
CREDIT LIMIT field is at customer, customer group and company level .
Explanation given on priority of the three levels.
 2017-10-18 10:53:11 +05:30
Rushabh Mehta
bc4e2cd9c1 [added] hospitality domain (#11020) 
* [added] hospitality domain

* [tests] wip

* [tests] for restaurant

* [fix] tests for new naming

* [docs] added restaurant docs

* [docs] added restaurant docs
 2017-10-17 12:30:34 +05:30
tunde
e27f5dee1f Merge branch 'develop' into payment-terms 2017-10-09 10:11:05 +01:00
Manas Solanki
f91ad75b5a test, patch, docs for student admission (#11075) 2017-10-09 12:41:24 +05:30
Nabin Hait
3b61552836 Revert "Advance against expense claim (#10632)" (#10877) 
This reverts commit cdd6ded790.
 2017-09-25 11:27:39 +05:30
tunde
d6cf6fb124 documentation for payment terms 2017-09-22 15:49:02 +01:00
tunde
73a83a472d validation for Payment Terms Template 2017-09-22 11:05:40 +01:00
Nabin Hait
cdd6ded790 Advance against expense claim (#10632) 
* Adds Whitelist Method for Advance Entry

* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date

* Adds changes for managing advance payments using Default Account and Party

* Removed console.log from the JS file

* Advance Payment Patch - Fixed Codacy errors

* Removed stray file

* Fixed conflicts due to changes in upstream

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed pending Codacy error

* Updated JS code by removing cur_frm which is soon to be deprecated

* Advance against Expense Claim: cleanup and fixes

* Test case fixed
 2017-09-21 18:03:45 +05:30
Rohit Waghchaure
0e28fccb34 [Enahance] Update variants fields defined in the Item Varianst Settings, if template updated 2017-09-21 15:41:57 +05:30
tundebabzy
ab5b03011d Enhance Currency Exchange Management (#10482) 
* add new settings in Accouts Settings

* patch for new settings

* refactor `get_exchange_rate`

* adds validation

* tests validation

* disables conversion rate field if stale rates not allowed

* more test cases

more test case...

test `get_exchange_rate` behaviour with stale not allowed in sett..

fix currency exchange test case

do housekeeping after running accounts settings test

* clean up

* documentation

* make use of correct api url

* Fix tests failing due to wrong exchange rate from fixer.io

* remove mandatory constraint from `allow_stale`

* added info to documentation
 2017-09-21 14:50:39 +05:30
rohitwaghchaure
850eaa73b0 Move subscription module to accounts (#10772) 2017-09-18 17:23:00 +05:30
Adam Dawoodjee
91eda6dad4 Update creating-custom-link-field.md (#10822) 
Grammer improvements
 2017-09-18 15:11:57 +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
rohitwaghchaure
166b78f022 [Enhance] Subscription module (#10089) 
* [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 (#10336) 
* [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
rohitwaghchaure
fd39d6bd3c [Enahance] Provision to select customer, item code while making an invoice from timesheet (#10616) 2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928 Help pages for Attendance (#10634) 
* Help pages for Schools setup

* Documentation of Schools module

* Help pages for Student

* Help pages for Student

* Help pages for Schools Student and Admission Module

* Documentation for Schools Attendance
 2017-09-04 10:17:18 +05:30
Nabin Hait
baacf51a00 Fixed merge conflict 2017-09-04 10:13:29 +05:30
Umair Sayed
f1881065a8 Merging Help Articles (Q & A) into Manual (Part 2) (#10629) 
* adding articles in the manual

* adding articles in the manual 2

* migrating help articles to manuals

* migrating help articles to manuals
 2017-09-01 16:26:41 +05:30
Umair Sayed
84be137b4e Migrating Help Articles (Q&A format) into User Manual (#10608) 
* adding articles in the manual

* adding articles in the manual 2

* migrating help articles to manuals
 2017-08-31 14:53:47 +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
575ab3ab70 [docs] for print style (#10452) 2017-08-21 12:24:28 +05:30
Ben Cornwell-Mott
f7e42211b9 Added Quote Status to RFQ Suppliers with No Quote 2017-08-17 11:18:49 +05:30
tundebabzy
5fc5b68a49 update multi currency accounting documentation to remove incorrect info (#10404) 2017-08-16 11:41:56 +05:30
Makarand Bauskar
0973161ae5 [docs] Translate the Schools Assessment section documentation to Spanish (#10398) 
* [docs] Translate the Schools app documentation to Spanish

* [docs] Translate the Schools Student section documentation to Spanish

* [docs] Translate the Schools SETUP section documentation to Spanish

* [docs] Translate the Schools ADMISSION section documentation to Spanish

* [docs] Translate the Schools FEES section documentation to Spanish

* [docs] Translate the Schools SCHEDULE section documentation to Spanish

* [docs] Translate the Schools Assessment section documentation to Spanish
 2017-08-14 14:55:48 +05:30
Rushabh Mehta
1fe1a47658 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
6cb14cfc04 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
89505522d3 [docs] update docs 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
94c6b7409b Updated documentation 2017-08-14 11:53:34 +05:30
Rushabh Mehta
dfd8f9b0ce [docs] move calculate-incentive-for-sales-team.md 2017-08-09 10:49:59 +05:30
Rushabh Mehta
c957ce161f [fix] titles 2017-08-09 10:46:17 +05:30
Rushabh Mehta
67884cb7cf [fix] remove 2fa from wizard docs 2017-08-09 10:46:17 +05:30
ckosiegbu
1ac6bcba23 Removal of SMS Settings and SMS Parameters from ERPNext (#10033) 
* Removal of SMS Settings and SMS Parameter from ERPNext.

* [DOCS]Documentation for Two Factor Authentication

* [Patch]Point SMS module to frappe core

* Rearrange doc help index.txt to fit

* [DOCS]Update Documentation for Two Factor Authentication
 2017-08-08 14:55:30 +05:30
Ben Cornwell-Mott
38d4be8325 Update manuals. Fix codacy issues 2017-08-01 17:38:47 +05:30
Rushabh Mehta
1fb4abc322 [docs] cleanup 2017-07-31 17:40:17 +05:30
Rushabh Mehta
4920d73adb [docs] remove {{docs_base_url}} 2017-07-31 16:41:35 +05:30
Rushabh Mehta
95349fe360 [docs] add headings 2017-07-31 16:21:12 +05:30
Nabin Hait
1fcd2b0676 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 21:09:42 +05:30
Rushabh Mehta
e16ec0c891 [minor] change docs_base_url 2017-07-28 14:56:59 +05:30
Makarand Bauskar
20f4d7f559 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2 User Permissions Redesign (#10006) 
* [fixes] for user permission

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions
 2017-07-28 14:33:15 +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
Rohit Waghchaure
120b6c0b3c UI test cases and documentation 2017-07-28 01:52:10 +05:30
Saurabh
dc6e369172 Merge branch 'master' into develop 2017-07-25 16:42:28 +05:30
Frappe PR Bot
3b128cabb2 [Translation] Updated Translations (#10047) 2017-07-25 11:46:16 +05:30
ci2014
13abada526 Update email-account.md (#10066) 
* Update email-account.md

Add information to conditional import

* Add files via upload
 2017-07-25 11:06:03 +05:30
bcornwellmott
96381da547 Supplier Scorecard (#9294) 
* 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
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) 
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
 2017-07-20 10:30:59 +05:30
mbauskar
113df55e64 Merge branch 'develop' 2017-07-18 13:07:01 +05:30
Prateeksha Singh
e012e24423 Sales Goal by Company (#9723) 
* [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 (#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
rohitwaghchaure
ea4497c8d2 Renamed the report Support Hours to Support Hours Distribution (#9874) 2017-07-17 14:55:42 +05:30
Narciso E. Núñez Arias
c9877c5c1e Translation of ERPNext manual .md files (#9872) 
* Translate Do I Need An ERP page

* Translate getting started with erpnext Page

* Translate Implementation Strategy Page

* Translate Spanish Index page

* Translate Flow Chart of transactions page

* Translate open source page

* Translate The Champion Page

* Fix spanish translation on Index page
 2017-07-17 12:10:47 +05:30
Umair Sayed
31af0849db Update navigation.md (#9798) 2017-07-11 21:07:03 +05:30
Frappe PR Bot
bfdb726072 [translation] translation updates (#9788) 2017-07-11 15:20:11 +05:30
mbauskar
a52e726b6b [docs] corrected the filename from sms_setting2 -> sms_settings2 2017-07-10 18:11:32 +05:30
Nabin Hait
7773ee8960 Sales invoice dashboard, multiple letter head in report and email alert docs 2017-07-07 12:49:05 +05:30
Nabin Hait
f3f0dfef2a Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658) 
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs

* Formatted Net Amount in item-tax-breakup

* GST print format fixes

* removed trailing whitespace

* removed trailing whitespace
 2017-07-06 14:49:34 +05:30
Nabin Hait
02c8607d04 Production Order Documentation for Required Items table (#9647) 2017-07-06 11:28:07 +05:30
Nabin Hait
852cb64e4f GST tax invoice print format and more (#9616) 
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608

* Reload gst print format only for Indian users

* Fixes as Codacy
 2017-07-05 12:58:19 +05:30
Frappe PR Bot
3ceab64bfa [translation] translation updates (#9611) 2017-07-04 16:08:14 +05:30
Makarand Bauskar
87f2848aeb resolved conflicts 2017-07-03 16:24:01 +05:30
Frappe
67bbcf6932 Resolved conflicts in index.md 2017-07-03 16:00:07 +05:30
Frappe
79918c66c2 Deleted old Images and added Global Search Help page 2017-07-03 15:58:14 +05:30
Makarand Bauskar
24ab20fe11 Merge pull request #9467 from rohitwaghchaure/support_hours_report 
[enhance] Report for analysis of support hours count
 2017-06-29 11:19:41 +05:30
mbauskar
3b0e6cecd6 [minor] fixed broken image url in gst documentation 2017-06-28 12:29:19 +05:30
Makarand Bauskar
eef3f62ff7 Merge pull request #9488 from rmehta/gst-reminder 
[regional] ability to send gst reminders to all parties
 2017-06-27 19:33:05 +05:30
Rushabh Mehta
00ae424cac [regional] ability to send gst reminders to all parties 2017-06-27 17:31:41 +05:30
Makarand Bauskar
90a3e60de7 Merge pull request #9372 from pratu16x7/serial-batch-entry 
Serial no/batch entry dialog
 2017-06-27 16:12:30 +05:30
mbauskar
8c3f99f12e revert customer-orders-invoices-and-shipping-status.md documentation 2017-06-27 12:49:10 +05:30
Makarand Bauskar
5d8803b23e Merge pull request #9435 from rmehta/gst 
GST (India) Setup and Invoices #8711
 2017-06-27 11:44:33 +05:30
pratu16x7
f970ca4d35 Update docs 2017-06-27 10:12:58 +05:30
Rohit Waghchaure
67526f244e [enhance] Report for analysis of support hours count 2017-06-26 17:04:52 +05:30
Makarand Bauskar
ebaea08225 Merge pull request #9437 from Arundhatii/20Jun 
Added help pages and deleted old images links to #9241
 2017-06-23 18:54:45 +05:30
Makarand Bauskar
1a78a3244b removed conflicts 2017-06-23 18:37:08 +05:30
rohitwaghchaure
8f51a5e527 In POS on click of delete button, remove the selected item from the cart (#9428) 2017-06-23 18:17:04 +05:30
Makarand Bauskar
1d962dd3f7 removed conflicts 2017-06-23 18:11:58 +05:30
Makarand Bauskar
bbf81aa3a4 image title translation 2017-06-23 18:11:00 +05:30
Makarand Bauskar
862302f02d image title translation 2017-06-23 18:10:06 +05:30
Makarand Bauskar
408336e7ad image title translation 2017-06-23 18:08:45 +05:30
Makarand Bauskar
ab49c3100d corrected image title 2017-06-23 18:04:56 +05:30
Frappe
a951e56f9c Modified help pages 2017-06-23 16:49:35 +05:30
Frappe
1f8e5fbcb1 Edited help page 2017-06-23 16:48:46 +05:30
Frappe
ca6fed359b Added help pages for Subcontracting and deleted old images 2017-06-23 16:48:17 +05:30
Frappe
9a8f33f855 Replaced screenshot in help pages, links to #9241 2017-06-23 11:30:26 +05:30
Frappe
8181a7463e added help page for Kanban Board, links to #9241 2017-06-23 11:30:26 +05:30
Frappe
ac08fbd438 added test documentation 2017-06-23 11:30:26 +05:30
Rushabh Mehta
210b6f8f7e [docs] 2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88 [gst] adde reports + docs 2017-06-22 22:32:08 +05:30
Makarand Bauskar
e995371b08 Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings 
[Enhance] Company wise perpetual inventory settings
 2017-06-22 12:35:41 +05:30
Makarand Bauskar
1b6746e3bc Merge pull request #9388 from saurabh6790/dropbox_doc_fix 
[update] dropbox documentation to show how to set redirect url to create access token
 2017-06-21 19:10:45 +05:30
Umair Sayyed
5057098a19 Updated help pages and removed old images, links to #9262 2017-06-21 17:54:39 +05:30
Saurabh
88b642637b update dropbox documentation to show how to set redirect url to create access token 2017-06-20 19:01:16 +05:30
Umair Sayyed
357cd6df90 added new images, links #9262 2017-06-20 18:19:50 +05:30
Umair Sayyed
3292e59dcd Replaced old images with new, links to #9262 2017-06-20 18:17:40 +05:30
frappe-pr-bot
db4bb720b8 [translation] translation updates 2017-06-20 11:22:36 +02:00
Makarand Bauskar
22773a29f7 Merge pull request #9356 from tundebabzy/issue_6510 
adds information about "Is Paid" and "Update Stock"
 2017-06-20 12:04:16 +05:30
Rohit Waghchaure
65ccb42f95 fixed document 2017-06-20 10:21:34 +05:30
tunde
4961072b51 adds the corrected breadcrumbs trail 2017-06-19 13:51:27 +01:00
tunde
46db749d62 adds information about "Is Paid" and "Update Stock" 2017-06-19 09:18:57 +01:00
Umair Sayed
ac2e32a511 replaced some old images with new, #9262 (#9335) 2017-06-19 09:23:04 +05:30
Umair Sayed
5dadb0e19a created help page for email inbox, fixes #9262 (#9315) 2017-06-16 11:57:44 +05:30
Nabin Hait
6d7b0ce794 Warehouse Account Linking (#9292) 
* [enhance] Added account in the warehouse

* documentation

* patch to move account head from account to warehouse

* fixed test cases

* Fixes in warehouse-account linking

* minor fix in test case
 2017-06-15 11:09:27 +05:30
Umair Sayed
0b8e19b5d8 Added new help pages as per OKR - DO NOT MERGE (#9291) 
* added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262

* some fixes in help docs
 2017-06-14 19:40:08 +05:30
Makarand Bauskar
a7a7c835cc Merge pull request #9196 from msiddiq0/patch-2 
Fix incorrect youtube link on Video Tutorials
 2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f Merge pull request #9195 from msiddiq0/patch-1 
Fixed wrong YouTube video link
 2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1 Merge pull request #9197 from msiddiq0/patch-3 
Fix incorrect YouTube link on Video Tutorials
 2017-06-13 17:05:19 +05:30
Makarand Bauskar
0c5d732cd8 Merge pull request #9208 from mbauskar/docs 
removed {next} from documentation and removed the globals from custom scripts
 2017-06-13 16:32:26 +05:30
mbauskar
828804fab0 [minor] removed the {next} from the last articles 2017-06-09 17:30:36 +05:30
mbauskar
11f0ee3cac [docs] removed the globals from documentation 2017-06-09 17:23:06 +05:30
msiddiq0
a05c168808 Fix incorrect YouTube link on Video Tutorials 
The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.
 2017-06-08 21:02:45 -04:00
msiddiq0
a095d6e04b Fixing youtube link 
Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"
 2017-06-08 20:51:50 -04:00
msiddiq0
03183332b4 Fixed wrong YouTube video link 
The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.
 2017-06-08 20:10:18 -04:00
Nabil Kadimi
41f6f4c200 Fix type (entrys) (#9131) 2017-06-07 20:08:11 +05:30
Nabil Kadimi
347a79db5a Fix typo (#9133) 2017-06-07 12:06:05 +05:30
Makarand Bauskar
2f17e70793 [minor] removed the {next} for last page (#9002) 2017-05-24 18:35:35 +05:30
Gaurav Naik
7f02714c26 Documentation for Allow Login using Mobile Number (#8918) 2017-05-19 16:03:05 +05:30
Julian Robbins
3d6567411d Spelling improvmement (#8866) 2017-05-17 19:36:15 +05:30
tundebabzy
cf7df5d106 fixes #8883 (#8885) 2017-05-17 19:17:04 +05:30
Saurabh
aa1be1ce92 [documentaion] stripe documentation (#8780) 2017-05-16 09:30:07 +05:30
Julian Robbins
62e3e75555 Addition of Imap to description of usable mail accounts (#8806) 2017-05-13 09:55:23 +05:30
Umair Sayyed
175646572a updated help pages 2017-04-25 16:27:50 +05:30
Ishan Loya
0dbe8547e7 Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique 2017-04-25 16:08:22 +05:30
Ishan Loya
c7a72684fd Add bank guarantee doctype with documentation 2017-04-25 16:08:22 +05:30
Ishan Loya
04c69fb46d Minor fix 2017-04-24 10:44:36 +05:30
Ishan Loya
f04ef8dfe0 Update documentation for Production Order skipping material transfer entry option 2017-04-24 10:44:36 +05:30
Rushabh Mehta
e385b5b97b [enhance] automatic batch creation, move and split 2017-04-24 10:28:38 +05:30