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

1412 Commits

Author SHA1 Message Date
Prateeksha Singh
aeb8abf1ed [setup] add market segments and sales stages 2018-12-12 21:29:55 +05:30
Prateeksha Singh
6f7233229e [setup][fix] company fixtures 2018-12-12 21:29:55 +05:30
Prateeksha Singh
6bf22fa7d7 [setup][fix] get newly created root Territory for children 2018-12-12 21:29:55 +05:30
Prateeksha Singh
c1c057611e [setup] bundle up fixtures and setup docs 2018-12-12 21:29:54 +05:30
Prateeksha Singh
dabf349599 [setup] don't premake company fixtures 2018-12-12 21:29:54 +05:30
Prateeksha Singh
b422458224 [setup] set the default fiscal year that was made 2018-12-12 21:29:54 +05:30
Prateeksha Singh
179d82702e [setup] fetch setup config 2018-12-12 21:29:54 +05:30
Prateeksha Singh
39b8765961 [setup][init] setup as document records 2018-12-12 21:29:54 +05:30
Saif
6a9d9d76ef
Company rename abbr to consider more DocTypes 2018-11-26 19:56:13 +05:00
rohitwaghchaure
849169e82b
Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count 
[Fix] Company dashboard sales count condition
 2018-11-13 11:37:26 +05:30
Rohit Waghchaure
14ffe8b935 [Fix] Company dashboard sales count condition 2018-11-13 11:35:38 +05:30
Ameya Shenoy
e8d3aa9cc9
Merge pull request #15966 from codingCoffee/frankfurter 
fix: changed currency exchange API to frankfurter
 2018-11-12 18:35:36 +05:30
Pawan Mehta
aa0bed16f6 [fix] #14038-Std hours at company level to calculate timesheet hours (#15819) 
* [fix] #14038

* codacy fixes

* add end time calc method

* test case and rename function

* Update timesheet.py
 2018-11-12 16:40:07 +05:30
Ameya Shenoy
438490fd29
fix: changed currency exchange API to frankfurter 
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
 2018-11-12 15:15:06 +05:30
Alchez
068ba191e7 [Feature] Route optimization for Delivery Trip stops (#15566) 
* Minor improvements

* [Feature] Route optimization for Delivery Trip stops

* Process and optimize the entire route, with or without locks

* Form sets of routes for optimization based on applied lock positions

* Re-arrange stops based on the optimized routes and lock positions

* Set delay times between stops - offset estimation times by delays cumulatively

* Fix codacy errors

* Fix travis

* feat(route_optimization): Set estimated route distance from Google Maps

* feat(route_optimization): Add tests for route lists

* feat(route_optimization): Fix tests
 2018-11-08 11:57:05 +05:30
Saurabh
99c064305f Merge branch 'master' into staging-fixes 2018-10-09 17:55:33 +05:30
Zlash65
a1036ad50b setup wizard failing fix 2018-10-09 17:38:28 +05:30
Ameya Shenoy
ecba14e6cf
Merge branch 'master' into staging-fixes 2018-10-08 09:39:49 +00:00
Shreya Shah
37d3686372 fix(setup_taxes): Pop if frappe.message_log (#15615) 2018-10-08 14:17:16 +05:30
Shreya Shah
c2857fd2cc fix(setup_taxes): Pop if frappe.message_log (#15611) 2018-10-08 12:35:18 +05:30
Sagar Vora
b13b9b4ed3 fix TabError in install_fixtures.py 2018-10-04 11:39:20 +05:30
Charles-Henri Decultot
75fa6b3ee8 [Enhancement] Improvement to the sales pipeline (#15524) 
* Additions to sales pipeline

* Codacy corrections

* Codacy corrections

* Codacy corrections

* Replace _ with dummy for unused variable

* Performance + dates corrections

* Itertuples modification

* Removing trailing whitespaces

* Sales stage doctype

* Divide sales stages fixtures in separate functions

* Remove duplicate fixtures

* Add newline after method

* Missing requirement
 2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
b2281cc1fd Lead to customer UX enhancement (#15525) 
* Lead to customer UX enhancement

* Market segment

* Market Segment to DocType

* Specific function for fixtures

* Merge issue correction

* Doctype merge correction
 2018-10-02 11:25:00 +05:30
Alchez
6ecb2556b7 Add Delivery Settings + improve 'Notify Customers' functionality (#15322) 
* Add Delivery Settings + improve 'Notify Customers' functionality

* Minor improvements

* Add patch to create a default dispatch notification template

* Fix travis errors
 2018-09-30 21:38:47 +05:30
Saif
c2dd9ab778 Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514) 2018-09-27 15:48:04 +05:30
deepeshgarg007
86152eb5c8 Sales person Commission Report and more (#15431) 
* Commission For Sales Person

* Changes Made

* Changes made in sales person dashboard and commission report

* Update sales_person_commission_summary.py
 2018-09-25 19:08:16 +05:30
Zarrar
e83ff38c10 [Enhance] Deferred Expense (#15437) 
* added section for deferred expense in item master

* added default expense account field in Company master

* added deferred expense section in purchase invoice item

* validation and getter code added

* scheduler event to book expense every month

* codacy, import fix and other minor fixes

* rectify debit credit logic for expense

* commonify js code for deferred expense and revenue

* remove deferred calculation and validation

* common file to calculate deferred revenue and expense

* codacy fixes

* expense account root_type - Asset, specific method naming
 2018-09-21 15:45:40 +05:30
Nabin Hait
73165ebd33 fix(patch): create healthcare patch only if domain activated 2018-09-07 18:44:14 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320) 2018-09-05 17:18:59 +05:30
Prateeksha Singh
b2b745fc7a [hub] simplify marketplace settings, remove company fields 
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
 2018-09-01 17:20:08 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255) 
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

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

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
 2018-08-31 16:12:49 +05:30
Shreya Shah
ee8f8281b4 [py3] Convert filter object to list (#15260) 2018-08-30 19:22:22 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

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

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Neil Trini Lasrado
771fbb8f01 Cleaned up welcome email code (#15175) 2018-08-24 15:15:56 +05:30
Zarrar
2b2712bb9e [Minor] Create default department on country setup (#15206) 
* make default department when creating new company

* remove departments and tds entry for the company
 2018-08-24 11:26:51 +05:30
Benji
363dd2773e Update email_digest.py (#15144) 2018-08-22 21:57:51 +05:30
Zarrar
2b0ecbed2b python3 based fix for sorted (#15159) 2018-08-20 11:15:06 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Nabin Hait
3b5f18231a fix(item_defaults): Item name was overwriting by child name 2018-08-13 17:45:29 +05:30
Nabin Hait
8bf52fef42 minor fixes 2018-08-09 19:45:33 +05:30
Nabin Hait
e07bf15de2 minor fix 2018-08-09 17:38:04 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Nabin Hait
84c7c77009 [optimize] Get defaults from item group based on doc 2018-08-08 14:30:44 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30