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

16923 Commits

Author SHA1 Message Date
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Sagar Vora
8aa34a0ce0 bumped to version 11.1.4 2019-02-05 19:00:38 +05:50
karthikeyan5
4cb0a250a0 fix(marketplace): bug in filtering menu_items 
> UX improvment for incomplete feature
 2019-02-05 18:07:48 +05:30
Nabin Hait
efff826e15
Merge pull request #16556 from nabinhait/payroll-cost-center 
fix: Don't force fetch cost center from company in payroll entry
 2019-02-05 13:32:16 +05:30
Nabin Hait
8a46df5c4b
Removed duplicate fields 2019-02-05 13:31:32 +05:30
Nabin Hait
38b05a1296 fix: Set default cost center in payroll entry 2019-02-05 10:46:41 +05:30
Nabin Hait
294319e71b fix: Don't force fetch cost center from company in payroll entry 2019-02-05 10:37:41 +05:30
Nabin Hait
ad69e29334
Merge pull request #16548 from nabinhait/stock-balance-item 
fix: Fetch data based on item group filter in item dashboard stock balance report
 2019-02-05 10:36:47 +05:30
Nabin Hait
1c288ca4ab
Merge pull request #16558 from deepeshgarg007/production_plan 
fix: Validation while getting raw materials for production in Production Plan
 2019-02-05 10:35:16 +05:30
Nabin Hait
fe6f1ad244
Update production_plan.py 2019-02-05 10:34:58 +05:30
Nabin Hait
d4e029665c
Merge pull request #16569 from nabinhait/salary-allow-on-submit 
fix: Allow-on-submit enabled for formula and condition in salary structure
 2019-02-05 10:31:24 +05:30
Nabin Hait
b6d2c7eb80
Merge pull request #16570 from saurabh6790/jinja_injection_fix 
fix: access request parameter directly
 2019-02-05 10:31:08 +05:30
Nabin Hait
7b93e738ad
Merge pull request #16576 from nabinhait/pay_reco_fix 
fix: Optimising payment reconciliation queries
 2019-02-05 10:28:03 +05:30
Nabin Hait
025e780f31
Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working 
fix: job card not working if transfer against work order
 2019-02-05 10:27:12 +05:30
Nabin Hait
ac18498ca5 fix: Optimising payment reconciliation queries 2019-02-04 21:13:43 +05:30
Rohit Waghchaure
780c6b0d77 fix: job card not working if transfer against work order 2019-02-04 21:04:48 +05:30
Chinmay Pai
125505f2aa
fix(purchase_invoice): fix undefined variable 
fixes issue while creating purchase invoice

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-04 16:30:20 +05:30
Saurabh
bbebceb31a fix: access request parameter directly 2019-02-04 15:56:23 +05:30
Nabin Hait
ff05ee50e0 fix: Allow-on-submit enabled for formula and condition in salary structure 2019-02-04 14:42:57 +05:30
Deepesh Garg
d442d06947
Update production_plan.py 2019-02-03 12:45:20 +05:30
dgarg007
f667cff5a6 fix: Validation while getting raw materils for production in Production Plan 2019-02-02 21:57:00 +05:30
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Saurabh
aba611e09f
Merge branch 'hotfix' into project_status_email_fix 2019-02-01 15:01:26 +05:30
Nabin Hait
e1c75a9d55 fix: fixed salary structure assignment patch (#16546) 
* fix: fixed salary structure assignment patch

* fix: patch
 2019-02-01 12:25:40 +05:30
Nabin Hait
f3f4ce9b87 fix: Fetch data based on item group filter in item dashboard stock balance report 2019-02-01 12:01:19 +05:30
Rohit Waghchaure
a4645b6d17 fix: check open status projects for project status update 2019-02-01 11:37:22 +05:30
Sagar Vora
56cbfe4bb0 Merge branch 'master' into develop 2019-01-31 13:34:32 +05:30
Sagar Vora
fea55fc018 bumped to version 11.1.3 2019-01-31 13:53:07 +05:50
Nabin Hait
a85f008f30
Merge pull request #16528 from adityahase/payment-request-usability 
fix(accounts): fetch subscription details only if required fields are populated
 2019-01-31 10:27:27 +05:30
Sagar Vora
7ea2497b9a
Fix salary patch (#16531) 
fix: salary structure assignment patch, add .vscode to gitignore
 2019-01-31 09:17:29 +05:30
Sagar Vora
76728b87ab
fix: value missing for selling settings - sales_update_frequency (#16530) 2019-01-31 08:19:38 +05:30
Sagar Vora
7a1c40c7c1 Merge branch 'master' into develop 2019-01-30 20:09:45 +05:30
Sagar Vora
664e21acbf bumped to version 11.1.2 2019-01-30 20:29:45 +05:50
Aditya Hase
245b73b94f fix(search): Fix possible reflected XSS attack vector (#16522) 2019-01-30 19:56:04 +05:30
Aditya Hase
66833f109b fix(accounts): fetch subscription details only if required fields are populated 2019-01-30 19:40:40 +05:30
Nabin Hait
78fc158b39
Merge pull request #16527 from nabinhait/bom-fix 
fix: Default value for 'raw materials rate based on' in BOM
 2019-01-30 18:35:49 +05:30
Saurabh
429996752d fix: patch fixes (#16524) 2019-01-30 17:45:48 +05:30
Nabin Hait
16d7b49d73 fix: Default value for 'raw materials rate based on' in BOM 2019-01-30 17:27:08 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
Saurabh
bb2031941e bumped to version 11.1.1 2019-01-30 13:08:00 +06:00
Saurabh
5c12490709 fix: patch to add guardian role if not exists 2019-01-30 11:52:53 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
1c44a6a0ba fix: set version to 11.1.0, remove staging_version 2019-01-29 18:52:50 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
1a4cd3b66a bumped to version 11.1.0 2019-01-29 18:46:34 +05:50
Sagar Vora
606bd37316 fix: change changelog version to 11.1.0 2019-01-29 17:55:46 +05:30
Sagar Vora
b5dda63ddd fix: change changelog version to 11.1.0 2019-01-29 17:54:47 +05:30
Sagar Vora
51a27b3524 fix: unsaved merge conflict 2019-01-29 17:52:47 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Sagar Vora
b32d9458b5 bumped to version 10.1.81 2019-01-29 17:30:19 +05:50