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

17007 Commits

Author SHA1 Message Date
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
ec5faaeae6
Merge branch 'hotfix' into stock-balance-fix 2019-01-31 18:46:06 +05:30
Nabin Hait
9ea19b8fe1 fix: Fixed error on stock balance report 2019-01-31 15:53:25 +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
Nabin Hait
f8e9734f16
Merge pull request #16514 from sagarvora/changelog 
docs: changelog for v11.0.4
 2019-01-29 16:27:07 +05:30
rohitwaghchaure
a95ed44d3d fix: test case for fiscal year (#16516) 2019-01-29 16:24:53 +05:30
Nabin Hait
9f33c208d7
Update v11_0_4.md 2019-01-29 16:07:07 +05:30
Sagar Vora
7ef69b68f8
Update v11_0_4.md 2019-01-29 15:52:57 +05:30
Nabin Hait
cc41b876fb
Merge pull request #16497 from nabinhait/bom_price 
BOM raw materials price
 2019-01-29 14:58:40 +05:30
Sagar Vora
115a252f55 docs: changelog for v11.0.4 2019-01-29 14:40:10 +05:30
Nabin Hait
4e45663297 fix(stock): get item price based on party 2019-01-29 14:02:08 +05:30
Sagar Vora
8f6509fa9a
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months 2019-01-29 13:04:20 +05:30
Sagar Vora
9520e345bd
fix: better error messages 2019-01-29 13:03:46 +05:30
Nabin Hait
1df9a23e7b
Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay 
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
 2019-01-29 13:02:56 +05:30
Rohit Waghchaure
07f75a3e54 feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart 2019-01-29 13:00:18 +05:30
Rohit Waghchaure
a8e743e3c4 fix: fiscal year always be for 12 months 2019-01-29 12:55:04 +05:30
Nabin Hait
6f7cc8b186
Merge pull request #16505 from deepeshgarg007/pos_issue 
feat: Enhancement  in POS functionality
 2019-01-29 12:51:00 +05:30
Nabin Hait
25cb13c0f8
Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes 
fix(human resources): gross pay calculation issue
 2019-01-29 12:08:11 +05:30
Nabin Hait
7fc9825954
Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 
feat: List Active Healthcare Practitioner
 2019-01-29 11:52:55 +05:30
Nabin Hait
8ba9545b72
Merge pull request #16498 from nabinhait/stock-ledger-report 
fix(stock): Escaping issue in stock ledger report
 2019-01-29 11:30:15 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue 2019-01-29 11:29:41 +05:30
Nabin Hait
3b8623e207
Merge pull request #16491 from adityahase/ar-fix 
fix(ar-summary): Changes to column list to match recent changes
 2019-01-29 11:28:02 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm 
GST Settings permission and regional taxes creation
 2019-01-29 11:27:18 +05:30
Nabin Hait
ff2922cbbb
Merge pull request #16488 from deepeshgarg007/price_list 
fix(sales_invoice): fetch customer price list if available before pos price list
 2019-01-29 11:24:22 +05:30
Nabin Hait
7c0fbfab0a
Merge pull request #16482 from pipech/staging-fixes 
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
 2019-01-29 11:23:05 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation 
feat: Deprecated In App Help
 2019-01-29 11:20:23 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Nabin Hait
1c5d681f65
Merge pull request #16500 from scmmishra/v10-remove-docs 
feat: [v10] Deprecate In App Help
 2019-01-29 11:05:25 +05:30
Nabin Hait
8fae0b3017
Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied 
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
 2019-01-29 11:03:44 +05:30
Nabin Hait
b44b200e7c
Merge branch 'hotfix' into fix-scorecard 2019-01-29 11:00:07 +05:30
Aditya Hase
9acb885e60 fix(sqli): Avoid SQL Injection with sender param (#16509) 2019-01-29 10:52:37 +05:30
Navdeep Ghai
ec570026e1
Merge branch 'hotfix' into salary-slip-net-pay-fixes 2019-01-29 09:12:37 +04:00
Nabin Hait
385e3bb284
Merge pull request #16446 from Zlash65/jv-fix 
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
 2019-01-29 10:41:15 +05:30
navdeepghai1
92bb84aa70
Changed static precision(2) value to system setting currency_precision value 2019-01-28 16:54:58 +04:00
deepeshgarg007
f0cfe98860 fix: Added missing semicolon and removed null from parameter 2019-01-28 17:58:44 +05:30
deepeshgarg007
0bee62b460 fix: Made period fields read only and added validation for multiple entries by same user 2019-01-28 12:45:11 +05:30
Sagar Vora
a1a946fcd6
Merge branch 'hotfix' into fix-scorecard 2019-01-28 12:20:55 +05:30
navdeepghai1
aac404a155
Fixed net_pay calculation issue 2019-01-28 10:42:16 +04:00
deepeshgarg007
4e4b200972 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue 2019-01-27 22:54:34 +05:30
deepeshgarg007
c2ffcc5e71 feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher 2019-01-27 16:09:07 +05:30
scmmishra
1b63fa1920 [fix] Formatting issues 2019-01-25 20:45:04 +05:30
scmmishra
e1f5d22a02 [fix] Code formatting, removed trailing spaces 2019-01-25 20:45:04 +05:30
scmmishra
000e216354 [feat] Added docsUrl variable to configure help_links 2019-01-25 20:44:45 +05:30
scmmishra
0be2aa33ac [fix] Links now redirect to erpnext.com 2019-01-25 20:41:54 +05:30
scmmishra
c6c1628c8a [feat] Modified help config 2019-01-25 20:41:54 +05:30
Nabin Hait
1187d61b56 fix(stock): Escaping issue in stock ledger report 2019-01-25 17:07:29 +05:30
deepeshgarg007
76556e1a3e Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list 2019-01-25 16:50:06 +05:30
deepeshgarg007
8c84b7b888 fix: Doctype Name correction 2019-01-25 16:44:45 +05:30
deepeshgarg007
49cca7ac76 fix: Customer based price_list in online POS 2019-01-25 16:41:01 +05:30
Nabin Hait
01ca3e5e36 fix(manufacturing): Get raw materials rate from price list ignoring party 2019-01-25 16:25:15 +05:30
Nabin Hait
3476a457ad fix: minor 2019-01-25 16:22:36 +05:30
Saif Ur Rehman
392d019bd0 fix(Item Tax Patch): Converted global variables to local 2019-01-25 15:09:43 +05:00
Shivam Mishra
67c338fd51
[fix] Fixed links 
Previous commit missed the links starting with `http://`
 2019-01-25 15:17:44 +05:30
scmmishra
f44dfb1582 [fix] Formatting issues 2019-01-25 14:56:30 +05:30
scmmishra
d71de2a23e [fix] Code formatting, removed trailing spaces 2019-01-25 14:27:23 +05:30
scmmishra
9731a02657 [feat] Added docsUrl variable to configure help_links 2019-01-25 13:14:11 +05:30
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
deepeshgarg007
1f9a6febdd fix: Assign given price list if POS price list is not available 2019-01-25 11:53:55 +05:30
Nabin Hait
f05d91d317
Merge branch 'develop' into Item-Tax-Template-V12 2019-01-25 11:26:47 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary 
feat: Party Ledger Summary Report
 2019-01-25 11:22:55 +05:30
Nabin Hait
ddc65dfb87 fix: delete taxes and charges template while deleting company 2019-01-25 11:04:14 +05:30
Nabin Hait
50e552321b
Merge pull request #16363 from scmmishra/leave-application-naming 
fix: Naming series not reflecting in leave application
 2019-01-25 10:34:01 +05:30
Nabin Hait
cce96758fc
Merge pull request #16484 from netchampfaris/add-logging-for-failed-exchange-rate 
chore: Add error logging for failed get_exchange_rate call
 2019-01-25 10:33:03 +05:30
Nabin Hait
42462fac9d
Merge pull request #16465 from nabinhait/eway_bill 
fix(accounts): Validate gst accounts defined in GST Settings in eway bill report
 2019-01-25 10:00:06 +05:30
Nabin Hait
f1ff5c24ff
Merge pull request #16469 from sagarvora/minor-gstin 
fix(regional): remove duplicate validation for GSTIN
 2019-01-25 09:59:45 +05:30
Nabin Hait
05f1c0e1b9
Merge pull request #16470 from netchampfaris/fix-jinja-unicode-formatting 
fix: Don't use .format in jinja templates
 2019-01-25 09:57:37 +05:30
Nabin Hait
e21bdf020c
Merge pull request #16472 from deepeshgarg007/cost_center 
fix(cost_center): Bug fix in  update_cost_center_number argument name
 2019-01-25 09:56:52 +05:30
Nabin Hait
76d93e7220
Merge pull request #16474 from deepeshgarg007/email_digest_fix 
fix: Wrong argument fix in email digest filters
 2019-01-25 09:55:47 +05:30
Nabin Hait
a6ab38665d
Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice 
fix: Dont show 0 amount taxes and tax breakup
 2019-01-25 09:54:07 +05:30
Nabin Hait
393080ecbe
Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working 
fix: ascii codec while opening offline POS
 2019-01-25 09:50:41 +05:30
Nabin Hait
f6459335da
Merge pull request #16493 from rohitwaghchaure/bank_reconcilliation_entry_issue 
fix: bank reconcilliation showing multiple entries against one JV
 2019-01-25 09:50:07 +05:30
Nabin Hait
fc9e733d7f
Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission 
fix: Show stock levels in Item master based on user permissions
 2019-01-25 09:48:43 +05:30
Suraj Shetty
1c9dd67f15
Merge branch 'staging-fixes' into add-logging-for-failed-exchange-rate 2019-01-25 09:22:46 +05:30
Rohit Waghchaure
e14cc8f2b6 fix: bank reconcilliation showing multiple entries against one JV 2019-01-25 00:23:41 +05:30
Saif Ur Rehman
37d7b80572 Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-24 23:41:35 +05:00
Saif Ur Rehman
3d275af67b Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
 2019-01-24 23:40:16 +05:00
Saif Ur Rehman
d5c7410ad1 Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-24 23:34:16 +05:00
Rohit Waghchaure
74df01d3d1 fix: ascii code while opening offline POS 2019-01-25 00:03:35 +05:30
rohitwaghchaure
7e4cf62a15
Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative 
Show outward entries in negative for Bank Clearance Summary report
 2019-01-24 22:13:40 +05:30
Aditya Hase
a40c43e414 fix(ar-summary): Changes to column list to match recent changes 2019-01-24 19:13:32 +05:30
Nabin Hait
2a1aedfff1 fix(setup): Create regional taxes on creation on company 2019-01-24 17:56:19 +05:30
Nabin Hait
49b41e49ae fix: Added permissions in GST Settings and added filters for accounts based on company 2019-01-24 17:55:44 +05:30
deepeshgarg007
c48efaba6e fix(sales_invoice): fetch customer price list if available before pos profile price list 2019-01-24 17:15:38 +05:30
Faris Ansari
d6f837c5e5 fix: Dont show 0 amount taxes and tax breakup 2019-01-24 17:10:33 +05:30
Faris Ansari
badf1c42e0 chore: Add error logging for failed get_exchange_rate call 2019-01-24 16:28:53 +05:30
Suraj Shetty
7a45887fa1
fix typo 2019-01-24 16:26:48 +05:30
Suraj Shetty
dd0496f7aa Add missed out field field 2019-01-24 16:18:43 +05:30
Suraj Shetty
c165838228 Filter bin list based on warehouses that are accessible to the user 2019-01-24 15:45:46 +05:30
pipeCh
c16c7fffb4 fixed for "Select Serial Numbers" dialog won't fill mandatory field 2019-01-24 15:00:07 +07:00
Suraj Shetty
41b3756df5 fix: patch to replace Project icon with Projects icon (#16374) 
* Delete duplicate projects icon from desktop.py

* Fix patch (to replace project to projects)
 2019-01-24 10:57:05 +05:30
deepeshgarg007
0c38cf06a5 fix: Wrong argument fix in email digest filters 2019-01-23 19:11:24 +05:30
deepeshgarg007
19ab86a3a7 fix:(cost_center): fix for update cost center number 2019-01-23 17:28:13 +05:30
Sagar Vora
e9778d9556 fix: do not use built-in "input", reload_doc 2019-01-23 17:13:31 +05:30
Sagar Vora
f51661b225 fix: allow operators, make weighting_function mandatory 2019-01-23 16:42:28 +05:30
Faris Ansari
853d3fd1ab fix: Don't use .format in jinja templates 
- Jinja doesn't allow unicode strings to be formatted in templates
 2019-01-23 16:34:22 +05:30
Sagar Vora
9aeabce3d3 fix: trailing whitespace, duplication & more 2019-01-23 16:01:19 +05:30
Sagar Vora
d75095b04c fix(regional): remove duplicate validation for GSTIN 2019-01-23 14:40:01 +05:30
Sagar Vora
57d7c837aa fix: supplier scorecard test 2019-01-23 14:26:35 +05:30
Sagar Vora
fb256d68ff Merge branch 'fix-supplier-scorecard' of /home/snv/Work/master_bench/apps/erpnext into fix-scorecard 2019-01-23 14:13:40 +05:30
Sagar Vora
037d0f8ba6 fix(buying): make supplier scorecard usable 2019-01-23 14:11:25 +05:30
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Frappe Bot
2d5bf69dc4 bumped to version 11.0.3-beta.37 2019-01-23 08:12:19 +00:00
Frappe Bot
34121bc81a Merge branch 'master' into staging-fixes 2019-01-23 08:08:55 +00:00
Frappe Bot
342854f6f2 bumped to version 10.1.80 2019-01-23 08:08:53 +00:00
Nabin Hait
06607fda4e
fix: removed print statement 2019-01-23 12:15:48 +05:30
Nabin Hait
141c543f97
Update journal_entry.js 2019-01-23 12:14:55 +05:30
Nabin Hait
36706c04bb
Merge pull request #16451 from nabinhait/unicode-issue 
fix: Unicode issue in purchase invoice
 2019-01-23 12:11:00 +05:30
Nabin Hait
d2e2ca31ac
Merge pull request #16460 from nabinhait/pricing-rule-issue 
fix: Enforce pricing rule based on rate on server side
 2019-01-23 12:09:12 +05:30
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes 
style: Linting fixes
 2019-01-23 12:08:57 +05:30
Nabin Hait
5b2922f76c
Merge pull request #16466 from nabinhait/project-nonetype 
fix(projects): None type handling while updating tasks
 2019-01-23 12:07:25 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports 
fix: Multiple fixes in the reports
 2019-01-23 12:05:36 +05:30
Nabin Hait
49e09624d6 fix(projects): None type handling while updating tasks 2019-01-23 10:43:00 +05:30
Nabin Hait
8c2a2c8f60 fix(accounts): Validate gst accounts defined in GST Settings in eway bill report 2019-01-23 10:33:47 +05:30
Aditya Hase
819a16d0f5 fix(dead-code): Remove .py files (#16462) 2019-01-23 07:57:08 +05:30
Aditya Hase
f79937d64b style: Remove unused imports 2019-01-23 00:28:37 +05:30
Aditya Hase
55a08dee78 style: Remove unusued local variable 2019-01-23 00:28:02 +05:30
Aditya Hase
4b4265f8a7 fix(dead-code): Remove .py files (#16457) 2019-01-22 20:54:21 +05:30
FinByz Tech Pvt. Ltd
237a871f17 fix: NoneType object has no attribute "gstin" (#16458) 
* fix: NoneType object has no attribute "gstin"

* fix: handle NoneType values
 2019-01-22 20:49:06 +05:30
Nabin Hait
da32916396 fix: Enforce pricing rule based on rate on server side 2019-01-22 19:06:06 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30