Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,062 Commits 3 Branches 0 Tags 1 GiB
6e53afd947
Commit Graph

30062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting (#19656) 2019-11-22 11:35:14 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting (#19657) 2019-11-22 11:34:50 +05:30
Saqib
150c44b350 fix: asset movement ux fixes (#19641) 2019-11-22 11:08:35 +05:30
Rucha Mahabal
3cf2c2b3d5 feat: slides for onboarding wizard in ERPNext 2019-11-21 20:47:08 +05:30
Mangesh-Khairnar
1a92eb14ed fix: Mark attendance from employee attendance tool (#19627) 2019-11-21 17:58:18 +05:30
0Pranav
f5112905dc import make_item method in tests 2019-11-21 13:19:44 +05:30
Rohit Waghchaure
c4e6c42950 fix: e-invoice issue 2019-11-21 11:20:49 +05:30
rohitwaghchaure
225d38e797
Merge pull request #19634 from rohitwaghchaure/cherry-pick_of_item_query_issue 
Cherry pick of item query issue
 2019-11-21 11:05:13 +05:30
Rohit Waghchaure
a831848074 fix: code cleanup 2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c fix: not able to select item in sales order 2019-11-20 19:42:11 +05:30
Khushal Trivedi
2224fe96c8 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-20 18:48:21 +05:30
Deepesh Garg
6a743be1de
Merge pull request #19625 from ruchamahabal/fix_cash_entry 
fix(minor): default Cash Entry account not getting fetched in Journal Entry
 2019-11-20 16:15:55 +05:30
gavin
01613669a5
Merge branch 'develop' into updated-requirements 2019-11-20 16:05:58 +05:30
0Pranav
4a28144941 add tests 2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7 remove: unused imports 2019-11-20 15:31:13 +05:30
0Pranav
ae90ea9547 fix:travis errors 2019-11-20 15:24:33 +05:30
marination
e537cda062 fix: Added conditional check for conversion factor 2019-11-20 12:38:58 +05:30
0Pranav
682956543e fix travis 2019-11-20 11:45:14 +05:30
Rucha Mahabal
45e9dd9c51 fix(Journal Entry): default Cash Entry account not getting fetched 2019-11-20 11:40:38 +05:30
0Pranav
fe2147a496 fix travis 2019-11-20 11:37:49 +05:30
0Pranav
dbde140e46 fix: save method of Appointment Booking Setting 2019-11-20 10:30:41 +05:30
0Pranav
c8e66a0f71 Infer number_of_agents from agent_list in apppointment booking settings 2019-11-20 10:27:59 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix 
fix: stock qty not displayed in pos
 2019-11-19 19:41:25 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order 
fix: not able to select item in sales order
 2019-11-19 19:40:11 +05:30
rohitwaghchaure
616254d2a0
Merge pull request #19622 from rohitwaghchaure/code_cleanup_sales_invoice_credit_note 
fix: code cleanup
 2019-11-19 19:39:18 +05:30
Rohit Waghchaure
248585b5a1 fix: code cleanup 2019-11-19 19:21:27 +05:30
Rohit Waghchaure
c42312ea12 fix: not able to select item in sales order 2019-11-19 19:06:51 +05:30
rohitwaghchaure
a85ddf2fb4 fix: performance issue of sales invoice while save/submit (#19598) 
* fix: performace issue of sales invoice while save/submit

* Cached price list data, item group child data, added indexing for blanket order
 2019-11-19 18:47:48 +05:30
Nabin Hait
9db9edca2c fix(expense claim): fetch outstanding documents based on party account type 2019-11-19 18:44:54 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile 
feat: multiple company pos profile
 2019-11-19 18:39:06 +05:30
thefalconx33
353f73a153 fix: stock qty not displayed in pos 2019-11-19 18:37:21 +05:30
Mangesh-Khairnar
c436d93303 fix: reset pos profile when default doesn't exists 2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate instead of date.today() 
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2019-11-19 12:04:30 +00:00
Mangesh-Khairnar
3f854fce2e feat: fetch leave approver from both employee and department approvers (#19613) 
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
 2019-11-19 15:07:30 +05:30
RJPvT
a998978415 fix: pending on review date (#19609) 
* fix: On Specific case if no item code in name

* fix: pending on review date
 2019-11-19 14:54:38 +05:30
Joseph Marie Alba
2578d49b84 Correct bug in abbr cause by missing " " separator (#19605) 
Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method.

For example: 

Company Name:    ABC Multiple Industries
Generates Abbr:     A
Correct Abbr should be:  AMI

This is caused by mission " " in split method.
 2019-11-19 14:54:09 +05:30
Shivam Mishra
776ff2f75d fix: query for item group listing (#19604) 2019-11-19 14:51:25 +05:30
Mangesh-Khairnar
f3ecfd8e58 fix: fetch leave approvers from both department and employee master (#19611) 
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
 2019-11-19 14:50:05 +05:30
0Pranav
539ea2cefb Rename doctype Appointment Booking Slots 2019-11-19 10:59:24 +05:30
0Pranav
b9460ed22c switched ORM methods for single SQL query 2019-11-19 10:46:07 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos 
fix: 'NoneType' object has no attribute 'replace' in POS
 2019-11-19 09:47:55 +05:30
deepeshgarg007
0debcf9f2f fix: Share existing condition logic 2019-11-18 22:12:29 +05:30
Khushal Trivedi
ea7979234d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-18 19:37:48 +05:30
deepeshgarg007
9c1c4ef3dd refactor: Share transfer cancellation and code cleanup 2019-11-18 17:52:19 +05:30
rohitwaghchaure
8131f7657e
Merge pull request #19601 from rohitwaghchaure/fix_set_query_not_working_for_department_field 
fix: not able to select department in instructor form
 2019-11-18 16:40:42 +05:30
marination
6ef057a2a3 fix: Prefilled JV via Account Balance and Stock Value mismatch error message 
- Make JV button will route to Journal Entry and add rows in child table
 2019-11-18 15:55:32 +05:30
Anurag Mishra
c0d8233a8b fix: Raw material qty depending on the quantity of the parent BOM 2019-11-18 15:45:53 +05:30
Rohit Waghchaure
39eeac265b fix: not able to select department in instructor form 2019-11-18 15:20:15 +05:30
Rohit Waghchaure
466702200f fix: 'NoneType' object has no attribute 'replace' in POS 2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90 fix: Book valuation expense in specified account rather than expense included in valuation account (#19590) 
* fix: Book valuation expense in specified accout rather than expense included in valuation account

* fix: Remove undefined variable

* fix: Test cases

* fix: Test Case
 2019-11-18 12:34:30 +05:30