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
Sagar Vora
c4bda9fac3
Merge branch 'staging' into develop
2019-01-22 18:17:09 +05:30
Sagar Vora
5555b2802f
bumped to version 11.0.3-beta.36
2019-01-22 18:37:09 +05:50
Sagar Vora
c84e3fe21b
Merge branch 'master' into staging-fixes
2019-01-22 18:16:13 +05:30
Sagar Vora
2a9a867f05
bumped to version 10.1.79
2019-01-22 18:35:44 +05:50
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Sagar Vora
64d774d178
bumped to version 11.0.3-beta.35
2019-01-22 16:05:56 +05:50
Nabin Hait
a5270e561f
fix: Unicode issue in purchase invoice
2019-01-22 15:43:04 +05:30
Sagar Vora
ceacacc320
Merge branch 'master' into staging-fixes
2019-01-22 15:37:05 +05:30
Sagar Vora
1e61dd024b
bumped to version 10.1.78
2019-01-22 15:53:48 +05:50
Rohit Waghchaure
ddd9136d10
Renamed field and added finance book column in the trial balance simple report
2019-01-22 14:11:57 +05:30
Aditya Hase
d157ae17b7
fix(ar-summary-report): Changes to column list to match recent changes in AR report
2019-01-22 13:37:54 +05:30
Zlash65
270c4c2a87
fix: push party filter only if applicable
2019-01-22 12:47:25 +05:30
Zlash65
c8d632ddff
fix: add set query for payroll entry in JV
2019-01-22 12:46:13 +05:30
Nabin Hait
22923ed663
Merge branch 'staging-fixes' into pr_staging_fixes_2
2019-01-22 10:51:59 +05:30
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix
...
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
2019-01-22 10:49:55 +05:30
Nabin Hait
a334ed879f
Update __init__.py
2019-01-22 10:41:50 +05:30
Nabin Hait
9adfd2d7b4
Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring
...
fix: Project update status feature's code and design refactored
2019-01-22 10:02:34 +05:30
Nabin Hait
b9b8d575bc
Merge pull request #16435 from deepeshgarg007/support-fix
...
fix(accounts_receivable): Bug fix in accounts receivable report
2019-01-22 09:59:17 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total
...
fix: Disable rounded total field's value honours docfield's default value
2019-01-22 09:58:06 +05:30
Nabin Hait
16bbf09947
Merge pull request #16440 from rohitwaghchaure/not_able_to_submit_work_order
...
fix: not able to submit work order
2019-01-22 09:57:49 +05:30
Rohit Waghchaure
de718dacb2
fix: Code cleanup
2019-01-21 19:47:17 +05:30
scmmishra
f2d0be7299
[feat] Modified help config
2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3
[feat] Updated all help_links
2019-01-21 19:35:02 +05:30
Rohit Waghchaure
11ce45077d
[Fix] Not able to submit work order
2019-01-21 19:18:52 +05:30
Nabin Hait
a39f324682
fix: Disable rounded total field's value honours docfield's default value
2019-01-21 18:50:50 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
deepeshgarg007
ff1078f271
fix(minor): fetch payment terms if voucher nos are available
2019-01-21 09:43:56 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
31d58eac01
fix(Party Ledger Summary): Added Supplier/Customer Name column
2019-01-19 15:28:53 +05:00
Saif Ur Rehman
55566b7f8e
fix(Party Ledger Summary): Codacy fix
2019-01-19 15:12:08 +05:00
Himanshu
79d4400c16
fix: Offline pos fix ( #16424 )
...
* Offline POS fix
* Fixed items search and load items
2019-01-19 14:01:38 +05:30
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Aditya Hase
442c85c006
fix(marketplace): Capitalize marketplace factory class to support router changes ( #16428 )
2019-01-18 21:28:37 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Faris Ansari
f523611e12
Merge branch 'hotfix' into leave-application-naming
2019-01-18 14:30:39 +05:30
Rohit Waghchaure
7e71e132a3
Added patch
2019-01-18 11:47:31 +05:30
deepeshgarg007
3c9dd73f91
Added company filters for reports
2019-01-18 11:29:37 +05:30
Nabin Hait
0c44701901
Merge pull request #16375 from deepeshgarg007/company_address
...
feat: Company address and GST field addition in sales order, purchase order, purchase receipt
2019-01-18 10:57:57 +05:30
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Nabin Hait
6202d0ed68
fix: NoneType comparison with int error
2019-01-18 09:40:24 +05:30
Nabin Hait
30667c160d
test: Inter company stock transfer for serialised items
2019-01-18 09:36:18 +05:30
Nabin Hait
5a87ac0ad8
fix: Inter company stock transfer for serialised items
2019-01-18 09:36:18 +05:30
Rohit Waghchaure
425dff93d7
fix: Project update status code and design refactored
2019-01-17 19:21:44 +05:30
deepeshgarg007
00f989a916
fix(email_digest): fix in account heads
2019-01-17 17:59:52 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Rohit Waghchaure
f725816809
Enhance: Added field limit in the Payment Reconciliation to handle large entries
2019-01-17 12:54:14 +05:30
deepeshgarg007
753c5d7514
fix(Codacy): Possible Sql injections
2019-01-17 12:28:56 +05:30
ks093
61c781325d
Fix to show low stock message.
...
In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.
2019-01-17 12:16:43 +05:30
ks093
1ed819bb10
Refresh quotation_series field to show series
2019-01-17 12:09:04 +05:30
Deepesh Garg
bce62a4bcc
Delete __init__.py
2019-01-16 22:57:45 +05:30
Deepesh Garg
70657d06f4
Delete pending_sales_order.json
2019-01-16 22:57:20 +05:30
Deepesh Garg
b8e0bfc335
Delete pending_quotation.json
2019-01-16 22:56:30 +05:30
Deepesh Garg
9cf9cb0e00
Delete __init__.py
2019-01-16 22:55:48 +05:30
Deepesh Garg
9da018d59c
Delete quotation.json
2019-01-16 22:55:10 +05:30
Deepesh Garg
59b9d363c9
Delete purchase_order.json
2019-01-16 22:54:45 +05:30
Deepesh Garg
23b7f0def4
Delete __init__.py
2019-01-16 22:54:17 +05:30
Deepesh Garg
e95a4053cf
Delete sales_order.json
2019-01-16 22:53:53 +05:30
Deepesh Garg
e6e1f2a46f
Delete __init__.py
2019-01-16 22:53:28 +05:30
Deepesh Garg
e4303111b4
Delete __init__.py
2019-01-16 22:53:00 +05:30
Deepesh Garg
9fb871c040
Delete pending_purchase_order.json
2019-01-16 22:52:27 +05:30
Deepesh Garg
3f5fea97fa
Delete __init__.py
2019-01-16 22:52:07 +05:30
deepeshgarg007
12b409b94a
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
2019-01-16 22:33:17 +05:30
deepeshgarg007
f8bbcc56b7
refactor(email_digest): Fixes in email digest links and reports
2019-01-16 22:22:48 +05:30
Nabin Hait
c8ac825f0d
Merge branch 'hotfix' into leave-application-naming
2019-01-16 17:54:35 +05:30
Nabin Hait
873442a55d
Merge branch 'staging-fixes' into Party-Ledger-Summary
2019-01-16 17:52:45 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix
2019-01-16 17:52:30 +05:30
Nabin Hait
cd40d87ebd
Merge branch 'staging-fixes' into pr_staging_fixes_2
2019-01-16 17:52:01 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address
2019-01-16 17:51:49 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix
2019-01-16 17:49:22 +05:30
Nabin Hait
3dd5f55412
feat(stock-reco): Fetch items in stock reco based on group warehouse
2019-01-16 16:20:05 +05:30
Nabin Hait
78ccbe24a3
fix(test): BOM raw materials rate from price list as per uom
2019-01-16 16:00:25 +05:30
Nabin Hait
158e7dcd8b
fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM
2019-01-16 16:00:25 +05:30
Nabin Hait
3dde949419
feat(mr_against_so): Merge same items from different BOMs
2019-01-16 15:59:39 +05:30
Sahil Khan
693e81db48
more bis fixes
2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50
BIS issue fixes
2019-01-16 15:59:39 +05:30
Saif Ur Rehman
fccb1e55ec
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-16 14:36:55 +05:00
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address
2019-01-16 11:17:55 +05:30
Nabin Hait
29552c1ec4
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
...
fix(website): Pagination in child item groups
2019-01-16 10:31:48 +05:30
Nabin Hait
38703080c9
Merge pull request #16360 from adityahase/demo
...
fix(demo): Look for "Total" instead of "'Total'" in report results
2019-01-16 10:23:59 +05:30
Nabin Hait
7686aa9ff6
Merge pull request #16400 from Zlash65/fix-deff
...
fix: for deferred settings for Item
2019-01-16 10:16:00 +05:30
Nabin Hait
7b3ee0e31c
Merge pull request #16403 from saurabh6790/patch_sequnce_fix
...
Patch sequence fix
2019-01-16 10:15:14 +05:30
Nabin Hait
7213895095
Merge pull request #16404 from Zlash65/fix-asset-category
...
fix: Asset Category field as link type and read only
2019-01-16 10:14:21 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency
...
fix: Quotation to Sales Order with different currency
2019-01-16 10:13:44 +05:30
Nabin Hait
d98315c41c
Merge pull request #16402 from sagarvora/fix-patch-testing
...
fix(tests): change patch order, optimise Travis
2019-01-16 10:13:14 +05:30
Saurabh
7d630b3e29
Merge branch 'master' into staging-fixes
2019-01-15 19:41:09 +05:30
Saurabh
529cc1ca51
bumped to version 10.1.77
2019-01-15 19:46:36 +06:00
Rohit Waghchaure
affeb3dfec
Added on account amount field in Accounts Payable/Receivable Summary
2019-01-15 17:38:31 +05:30
deepeshgarg007
7278834d25
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
2019-01-15 17:02:12 +05:30
Rohit Waghchaure
1a4c1e11cb
Fix: total invoiced amount in Accounts Receivable Summary report showing blank
2019-01-15 17:01:34 +05:30
Zlash65
cef56b5147
fixes asset category field as link type and read only
2019-01-15 16:26:58 +05:30
Rohit Waghchaure
b2d08a498b
Added bank account field in the payment entry
2019-01-15 16:11:29 +05:30
Zlash65
a3dd798bad
clean if conditions
2019-01-15 16:05:42 +05:30
Rohit Waghchaure
bdee57ca8d
Added finance book in trial balance and fixed cost center not working issue in trial balance
2019-01-15 15:52:52 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Sagar Vora
876d868fa1
fix(tests): change patch order, optimise travis
2019-01-15 15:45:33 +05:30
Rohit Waghchaure
df7215dcb2
Added supplier name in the tds report
2019-01-15 14:48:06 +05:30
Saurabh
68ea608ca8
fix: import unicode_literals
2019-01-15 14:47:32 +05:30
Zlash65
627be1de51
minor fixes for deferred calculations
2019-01-15 14:16:50 +05:30
NahuelOperto
9080221d46
fix: added test cases
2019-01-14 12:12:56 -03:00
Nabin Hait
d92024bb0f
Merge branch 'hotfix' into leave-application-naming
2019-01-14 20:26:01 +05:30
Nabin Hait
acd7f73d57
Merge branch 'hotfix' into group_warehouse_stock_reco
2019-01-14 20:25:53 +05:30
Nabin Hait
55c672eefd
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
2019-01-14 20:25:22 +05:30
Nabin Hait
4ed7cfc515
tests(cost-center-company): Validate cost center's company and revent tests
2019-01-14 17:14:39 +05:30
Himanshu
cccc78e197
fix: Qms icon color and label fix ( #16293 )
...
* qms color fix according to palette
* changed qms icon and color
* patch to change icon
* fix no module named v12_0
* removed spacing in desktop icon
* fix: line break
* renamed QM to Quality
* patch to rename quality management to quality
* resolve merge conflicts
2019-01-14 14:36:54 +05:30
Saif Ur Rehman
502f15ba1b
test: test_party_details_tax_category
2019-01-12 19:07:39 +05:00
Saif Ur Rehman
bbd1e47758
test: test_tax_calculation_with_item_tax_template
2019-01-12 18:28:15 +05:00
rohitwaghchaure
ba54209c86
[Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available ( #16379 )
2019-01-12 17:58:00 +05:30
NahuelOperto
7facc34851
fix: removed filter from method validate
2019-01-11 10:46:38 -03:00
deepeshgarg007
2e9c2ff545
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
2019-01-11 15:57:48 +05:30
Fisher Yu
2cd49f51e2
fix issue #16284 , child table copy ( #16285 )
...
* fix issue #16284 , child table copy
V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float'
* Update get_item_details.py
consider the empty string case
* Update get_item_details.py
2019-01-11 15:31:33 +05:30
Rushabh Mehta
d254af9fea
fix(patch): set_backup_limit.py
2019-01-11 15:07:26 +05:30
Nabin Hait
5c86cf54a2
Merge pull request #16288 from Anurag810/task-fixes
...
[fix] 'Expected End Date' in task should not be later than 'Expected End Date' of project
2019-01-11 14:21:58 +05:30
Anurag Mishra
cd8908362a
Changes Requested Done
2019-01-11 12:23:23 +05:30
Saif Ur Rehman
5085673030
test: fix for Item Tax Template v12
2019-01-11 03:53:43 +05:00
Nabin Hait
7e3c80bd8a
Merge pull request #16213 from nabinhait/pplan_fix
...
fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse
2019-01-10 17:57:28 +05:30
Nabin Hait
0d208851a4
Fix(stock-reco): Fixed codacy issues
2019-01-10 17:56:11 +05:30
Sagar Vora
f99e013ebc
fix: gstin validation should work when there is no state ( #16378 )
2019-01-10 11:57:24 +05:30
Sagar Vora
07cf4e8f5b
fix: use division consistent with Python 3 & other changes
2019-01-10 11:14:58 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
Nabin Hait
afbdaa525e
Merge pull request #16365 from hiousi/patch-1
...
fix: variant can not get its price
2019-01-10 10:36:27 +05:30
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix
...
fix: Sales Analytics Period Range
2019-01-10 10:35:31 +05:30
Saif Ur Rehman
fc5c9b8ab8
chore: Move Item Tax Template patch to v12
2019-01-10 04:34:14 +05:00
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
Saif Ur Rehman
edd0e2476f
chore: Updated item.json, no changes
2019-01-10 04:16:10 +05:00
deepeshgarg007
720020319f
fix(Codacy): removed unused variable
2019-01-09 21:56:45 +05:30
deepeshgarg007
c039f70496
Test Cases for
...
account balance report
2019-01-09 21:56:45 +05:30
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
deepeshgarg007
2b47d39274
feat: Links for reports in email digest
2019-01-09 21:54:40 +05:30
karthikeyan5
2825b929c1
fix(GSTIN Validation - india): added checksum validation for GSTIN
2019-01-09 19:15:10 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address
2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307
Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt
2019-01-09 17:09:11 +05:30
Rohit Waghchaure
701c762a68
Show outward entries in negative for Bank Clearance Summary report
2019-01-09 14:21:03 +05:30
Saif Ur Rehman
2689dea72a
fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse
2019-01-09 13:43:06 +05:00
Jamsheer
319ca86c81
fix: Test Fee Validity
2019-01-09 13:29:20 +05:30
Saif Ur Rehman
eb7277d2d4
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
Jamsheer
c0ac849776
fix: Helathcare Prcatitioner custom query escaped
2019-01-09 11:48:41 +05:30
Jamsheer
45c5138eaf
fix: updated options for abdomen in Vital Signs
2019-01-09 11:19:27 +05:30
Jamsheer
f2d7e3309f
fix: Patient Appointment - Calendar - status != Cancelled
2019-01-09 11:19:27 +05:30
Jamsheer
17bb0da278
fix: remove print statement
2019-01-09 11:19:27 +05:30
Jamsheer
c3804230cd
fix: Patient - Quick Entry enabled
2019-01-09 11:19:27 +05:30
Jamsheer
52ac72e63e
fix: Validate Patient Appointment
2019-01-09 11:19:27 +05:30
Jamsheer
c0097ad729
feat: Filter active Healthcare Practitioner
2019-01-09 11:19:27 +05:30
Jamsheer
fb7b5292b3
fix: Clinical Procedure - consume stock if items present
2019-01-09 11:19:27 +05:30
Jamsheer
3e01891e22
fix: Traverse note from procedure prescription to appointment
2019-01-09 11:19:27 +05:30
Jamsheer
f3c4f5a901
fix: Clinical Procedure - copy fields from appointment
2019-01-09 11:19:26 +05:30
Jamsheer
f4d0fcb836
fix: patient - user welcome email configuration
2019-01-09 11:19:26 +05:30
Jamsheer
b2c9268ece
fix: Patient Appointment - Calendar - set color from appointment type
2019-01-09 11:19:26 +05:30
hiousi
9671438435
Update get_item_details.py
2019-01-08 22:23:45 +01:00
hiousi
1516e29609
[fix] variant can not get its price
...
get_price_list_rate() return empty dict before trying to get the item price for a variant.
2019-01-08 18:34:08 +01:00
Nabin Hait
bf0b6fd8a9
Merge pull request #16342 from finbyz/staging-fixes
...
fix: rounded total if available while caclulating advance paid
2019-01-08 20:29:32 +05:30
Nabin Hait
c13b0562ba
Merge pull request #16337 from Anurag810/Employee
...
fix: Employee Onboarding/Seperation task Assignment
2019-01-08 20:27:43 +05:30
Nabin Hait
142d8aa973
Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt
...
fix: negative amount showing in the bank clearance summary report
2019-01-08 20:25:26 +05:30
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes
...
fix: expense head of asset items in purchase invoice
2019-01-08 20:23:14 +05:30
Nabin Hait
0f3ccba741
Update test_asset.py
2019-01-08 20:23:01 +05:30
Nabin Hait
2da5937864
Merge pull request #16314 from surajshetty3416/patch-to-rename-additional-salary-component
...
fix: patch to rename additional salary component
2019-01-08 20:21:16 +05:30
scmmishra
e2762df90b
Fix: Naming series not reflecting in leave application
2019-01-08 17:38:28 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saurabh
1836285c01
bumped to version 11.0.3-beta.34
2019-01-08 16:52:38 +06:00
rohitwaghchaure
ffdadbf97f
fix: fallback to stock uom if uom is not defined ( #16329 )
...
* [minor] Code cleanup
* fix: remove 'or' condition, won't execute
2019-01-08 16:21:25 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
...
fix: Loyalty program issue fix in customer dashboard
2019-01-08 12:15:57 +05:30
Nabin Hait
4c08aaef3d
Merge pull request #16290 from deepeshgarg007/stock-recon
...
fix: Unorderable type error while making stock reconciliation entry
2019-01-08 11:55:49 +05:30
Nabin Hait
4216d86dd9
Merge pull request #16296 from deepeshgarg007/update_items_bug
...
fix: Validation while updating items in sales order
2019-01-08 11:54:52 +05:30
Nabin Hait
49ca9dceb2
Merge branch 'staging-fixes' into report-fix
2019-01-08 11:53:06 +05:30
Nabin Hait
4e3e784691
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
...
perf: Customer contact column in accounts receivable report
2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc
fix: Divide by zero exception fix in item wise purchase register ( #16247 )
...
* Do not prepare row if stock quantity is not available
* Update item_wise_purchase_register.py
2019-01-08 08:34:28 +05:30
Aditya Hase
85c6a0f002
fix(test): Do not rely on order by name
2019-01-08 00:09:37 +05:30
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Aditya Hase
972f659fd5
fix(naming): Use creation instead of name to order GL Entries
2019-01-08 00:09:30 +05:30
Aditya Hase
7bc692d48d
feat(naming): Deferred naming for Stock Ledger Entry and GL Entry
...
For fast lockless insertions use hash as autonaming method for
temporarily naming Stock Ledger Entry and GL Entry
In an hourly run scheduled job rename these entries using autoname options
2019-01-08 00:07:54 +05:30
Aditya Hase
41d189a34c
fix(demo): Look for "Total" instead of "'Total'" in report results
2019-01-07 23:01:40 +05:30
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Sagar Vora
7d60c03ed9
Merge branch 'staging-fixes' into pplan_fix
2019-01-07 15:54:16 +05:30
Sagar Vora
f5a00dc0c1
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
2019-01-07 15:45:33 +05:30
Sagar Vora
cad20abe83
Merge branch 'staging-fixes' into loyalty-program-fix
2019-01-07 15:32:40 +05:30
Sagar Vora
a4af874a43
Merge branch 'staging-fixes' into update_items_bug
2019-01-07 15:21:02 +05:30
Sagar Vora
278d7a44f9
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-07 15:12:44 +05:30
Sagar Vora
92cab55c72
Merge branch 'staging-fixes' into purchase-invoice-fixes
2019-01-07 15:03:37 +05:30
Sagar Vora
fd78339a7c
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison
2019-01-07 14:54:44 +05:30
Sagar Vora
26e5c9480b
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd
2019-01-07 14:30:23 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
...
fix: replaced str to cstr in genral ledger report
2019-01-07 14:28:27 +05:30
Sagar Vora
f733a39089
fix: remove trailing whitespace
2019-01-07 14:24:01 +05:30
Sagar Vora
fbadb19d93
Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
2019-01-07 13:55:43 +05:30
Sagar Vora
d40743a570
fix: 14th digit may not be zero
2019-01-07 13:38:43 +05:30
Sagar Vora
3c74266763
fix: PEP8 recommended whitspace
2019-01-07 13:13:16 +05:30
Sagar Vora
23a1b98957
fix: remove unnecessary code
2019-01-07 13:10:18 +05:30
Saif Ur Rehman
848bbac05e
Added patch for Item Tax Template
2019-01-07 05:32:38 +05:00
Saif Ur Rehman
f484f0d6e8
Added test for Tax Rule based on Tax Category
2019-01-07 00:37:01 +05:00
Rohit Waghchaure
ed6725172d
Replaced str to cstr in genral ledger report
2019-01-06 20:07:18 +05:30
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
Deepesh Garg
0eca1646e6
Merge branch 'staging-fixes' into loyalty-program-fix
2019-01-06 12:16:54 +05:30
Deepesh Garg
4772ae2755
Merge branch 'staging-fixes' into stock-recon
2019-01-06 12:16:45 +05:30
Deepesh Garg
16745c2553
Merge branch 'staging-fixes' into update_items_bug
2019-01-06 12:16:37 +05:30
Deepesh Garg
627b566445
Merge branch 'develop' into opportunity-lost-reason
2019-01-06 12:16:26 +05:30
Deepesh Garg
b12c7358b1
Merge branch 'staging-fixes' into report-fix
2019-01-06 12:16:11 +05:30
Deepesh Garg
f840c92c10
Merge branch 'staging-fixes' into accounts-receivable-fix
2019-01-06 10:35:12 +05:30
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
Saif Ur Rehman
b1288b75ba
fix: Test Records
2019-01-06 04:41:13 +05:00
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
Frappe Bot
0d54271d15
bumped to version 11.0.3-beta.33
2019-01-05 09:11:14 +00:00
finbyz
5efc7973ea
Minor Fix for Rounded Total
2019-01-05 11:12:11 +05:30
Mangesh-Khairnar
e2ea987610
fixed edge cases for yearly, weekly and monthly views
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a
(refactor) removed unnecessary code
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6
(fix) multiple years in yearly view
2019-01-05 00:15:31 +05:30
Himanshu
75ab042632
removed lowercase regex
2019-01-04 17:13:43 +05:30
Deepesh Garg
1bb9287b2d
Merge branch 'staging-fixes' into update_items_bug
2019-01-04 14:15:40 +05:30
Suraj Shetty
aea25b147f
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-04 13:45:56 +05:30
Sahil Khan
3ac57c756b
fix: remove print statement from test case
2019-01-04 12:57:34 +05:30
deepeshgarg007
eabf260706
fix :Test cases for accounts receivable report
2019-01-04 12:34:28 +05:30
Anurag Mishra
bb6a7eb9d3
refractor
2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3
Fix: Employee Onboarding/Seperation task Assignment
2019-01-04 11:36:30 +05:30
Anurag Mishra
68aedfd176
typo
2019-01-04 11:00:07 +05:30
deepeshgarg007
9de81cda77
Added Customer contact column in accounts Receivable
2019-01-04 10:54:24 +05:30
Anurag Mishra
f2b29a0488
typo
2019-01-04 10:54:05 +05:30
Himanshu
547229fef1
PAN card validation in GST
2019-01-03 23:20:38 +05:30
deepeshgarg007
32f054b901
Added customer group column in item-wise-sales-history report
2019-01-03 22:57:18 +05:30
Suraj Shetty
6fe5c5c84d
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-03 16:59:30 +05:30
Rohit Waghchaure
8bac5b6e73
[minor] Employee is reqd to preview salary slip from salary structure
2019-01-03 16:20:35 +05:30
Nabin Hait
47c9826b6f
test(reco-warehouse): Get items for group warehouse
2019-01-03 15:24:59 +05:30
Himanshu
53c040f838
Gst number validation fix
2019-01-03 12:50:18 +05:30
Rohit Waghchaure
3dc5b93db7
[Fix] Report quoted item comparison not working
2019-01-03 12:19:44 +05:30
Saif Ur Rehman
648bd15b2a
Force item_tax_rate on setting item details server-side
2019-01-03 04:03:54 +05:00
Sagar Vora
c14c7c84e3
fix: leave application and timesheet tests
2019-01-02 21:28:11 +05:30
Rohit Waghchaure
1ff1fc4725
[Fix] Negative amount showing in the bank clearance summary
2019-01-02 17:56:08 +05:30
Anurag Mishra
4c8c50e464
test case fixed
2019-01-02 17:52:28 +05:30
Suraj Shetty
0f8eb37e1c
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-02 17:47:59 +05:30
Saif Ur Rehman
016f29f09b
fix: error due to passing None in scrub
2019-01-02 16:22:22 +05:00
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Anurag Mishra
772e2c4e20
test cases
2019-01-02 15:59:58 +05:30
rohitwaghchaure
9c69e40970
Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department
...
[Fix] Not able to delete department
2019-01-02 15:58:24 +05:30
Anurag Mishra
5865fcca3c
fix: expense head of asset items in purchase invoice
2019-01-02 14:36:07 +05:30
Deepesh Garg
74306cc5ea
Merge branch 'staging-fixes' into update_items_bug
2019-01-02 14:10:23 +05:30
deepeshgarg007
8c4bd951a8
fix(Codacy): Deleted unused imports and files
2019-01-02 13:24:12 +05:30
deepeshgarg007
9c0c633259
fix: Added validation for stock reconciliation in stock ledger entry
2019-01-02 11:31:55 +05:30
Suraj Shetty
c349ae26b9
Add patch to rename additional salary component
...
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
2019-01-02 09:31:11 +05:30
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
deepeshgarg007
8300f5ede7
fix: Codacy issues and added test case
2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
deepeshgarg007
9eb99dc61e
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon
2019-01-01 18:40:24 +05:30
deepeshgarg007
318dc422bc
Updated test Cases for update_child_rate_qty
2019-01-01 18:30:33 +05:30
deepeshgarg007
1451304526
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into update_items_bug
2019-01-01 17:13:37 +05:30
Saif Ur Rehman
fac6b59627
Exclude opening invoices in Gross Profit Report
2019-01-01 16:33:22 +05:00
Rohit Waghchaure
c186f153ff
Added test cases
2019-01-01 15:03:56 +05:30
Anurag Mishra
0885485a61
changes
2019-01-01 15:00:16 +05:30
Anurag Mishra
77d779424b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into task-fixes
2019-01-01 14:38:54 +05:30
Anurag Mishra
a3b5f5f6e4
Test case
2019-01-01 14:11:59 +05:30
Rohit Waghchaure
8f62aec2e3
[Fix] Not able to delete department
2019-01-01 14:06:40 +05:30
deepeshgarg007
de1e6fc1c4
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason
2019-01-01 08:57:18 +05:30
deepeshgarg007
c5a0b2edb6
Lost opportunity report
2018-12-31 16:34:16 +05:30
deepeshgarg007
5e9c7e2203
fix:Test cases for opportinity
2018-12-31 16:24:46 +05:30
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction
...
[Fix] Filter cancelled and draft payments in sales payment summary
2018-12-31 12:02:19 +05:30
Nabin Hait
c466825a8a
Merge pull request #16272 from frappe-pr-bot/translations-2018-12-24
...
[Translation] Updated Translations
2018-12-31 11:59:13 +05:30
Nabin Hait
cacbdec565
Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer
...
[Fix] Not able to delete customer if contact is available
2018-12-31 11:55:24 +05:30
deepeshgarg007
dc218ebeeb
test :test case for setting opportunity as lost
2018-12-29 22:11:19 +05:30
deepeshgarg007
d9a768a88f
feat: Set lost reasons in opportunity and quotation using table multiselect
2018-12-29 19:33:44 +05:30
Saif Ur Rehman
f6a83daae6
fix: update item_tax_template account_type server-side validation
2018-12-29 02:27:03 +05:00
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
rohitwaghchaure
f07cde6351
Merge pull request #16306 from rohitwaghchaure/removed_duplicate_fields
...
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
2018-12-28 17:49:52 +05:30
sahil28297
50f0a99330
fix: Checks for status in employee and for date range in upload attendance. ( #16279 )
...
* fix: checks for status in employee and for date range in upload attendance.
1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.
* remove "import erpnext"
* fix: replace frappe.db.sql with frappe.db.get_all
* fix: refactored using list comprehension
* fix: query refactoring
* fix: combining list comprehensions
* travis debugging
* fix: doc.save
2018-12-28 17:15:56 +05:30
Anurag Mishra
3637e14e9f
refractor
2018-12-28 17:11:52 +05:30
Anurag Mishra
0c8411d085
test cases sucess
2018-12-28 16:53:00 +05:30
Rohit Waghchaure
df4fe922c0
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
2018-12-28 16:46:36 +05:30
Nabin Hait
fcbe410c2f
feat(stock-reco): Fetch items based on group warehouse
2018-12-28 16:31:05 +05:30
Faris Ansari
af75d9a384
fix(website): Pagination in child item groups
...
Item groups pages which had child item groups were not paged at all
despite having next, prev buttons
2018-12-28 14:47:51 +05:30
Saif Ur Rehman
e414a92d55
fix: Run get_item_tax_info and set_taxes serially
2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
Charles-Henri Decultot
e87eb07e16
Correction for Travis
2018-12-27 17:38:57 +00:00
Charles-Henri Decultot
8d71015bf8
Cleanup journal entries
2018-12-27 16:43:26 +00:00
Charles-Henri Decultot
b7339d7dcb
Test travis
2018-12-27 15:30:56 +00:00
Charles-Henri Decultot
43c7bd57e4
Cancel existing payment entries for data integrity in test
2018-12-27 14:43:30 +00:00
Charles-Henri Decultot
641d3e0073
Add own records
2018-12-27 13:43:56 +00:00
deepeshgarg007
77cde832d6
Added validation for update items in purchase order as well
2018-12-27 15:56:51 +05:30
Charles-Henri Decultot
0f9c47c242
Remove pricing rule from items
2018-12-27 10:10:18 +00:00
Charles-Henri Decultot
02aa9fb240
Understand Travis
2018-12-27 08:46:29 +00:00
deepeshgarg007
ffb411d9e2
Validation while updating items in sales order
2018-12-27 14:12:05 +05:30
Suraj Shetty
3de12db2b1
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Charles-Henri Decultot
d7777696d7
Corrections for Travis
2018-12-26 14:08:00 +00:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Frappe Bot
23beec2bd1
bumped to version 11.0.3-beta.32
2018-12-26 12:04:55 +00:00
deepeshgarg007
22e05b24f3
Fix for NoneType comparison with int error
2018-12-26 17:16:34 +05:30
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
Frappe Bot
9a9c9c2ba3
bumped to version 10.1.76
2018-12-26 11:09:34 +00:00
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields
...
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:25:44 +05:30
Charles-Henri Decultot
9c1db688d1
Ignore pricing rule for Travis
2018-12-26 10:33:42 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
Charles-Henri Decultot
899b9b1ea7
Codacy correction
2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25
Remove ununsed variable
2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9
Test cases
2018-12-26 08:36:32 +00:00
deepeshgarg007
a1d015cc2f
Initialized loyalty_point_details
2018-12-26 11:01:02 +05:30
Rohit Waghchaure
52a692ee08
[Fix] Not able to delete customer if contact is available
2018-12-26 02:34:13 +05:30
Himanshu
0209ef0fc5
Quality Management System ( #15893 )
...
* Added QMS to ERPNext
* changes
* fixed
* code refracted
* refracted
* some bugs fixed
* changes
* changes
* test case
* bug fix unit test
* bug fix
* refracted code
* test warning fix
* test case bug fix
* removed whitespace
* indentation bug fix
* unit test bug fix
* fixed Tree
* bug fix
* bug fix
* code refactor
* fixed procedure tree
* removed unnecessary fields
* hide fields
* removed depricated unit test method
* sql injection bug fix
* code refactor and added mandatory fields
* Removed Add Child from TreeView
* Unit Test crashes Fix
* code refactor
* Fixed Status of Action
* removed add button from Chart of Procedure
* Fixed Unit Test for Quality Action
* Chamged Measurement Unit to UOM
* Changed Measurement Unit to UOM
* Quality Action Unit Test Fix
* Renamed Chart of Procedures to Tree of Procedures
* Changes Objective input type to Text
* Code Refactor
* Quality Action Status option changed to "Close" for consistency
* fixed action status indicator
* Removed vscode folder
* unit tests optimization
* unit test fixes
* code refactor
* gitignore
* bug fixes and code refactor
* code refactor
* unit test changes
* changed quality action unit test
* code refactor
* code refactor
* code refactor
* indentation
* code refactor
* corrected typo
* Removed jQuery hide()
* code refracted
* remove grid elements
* Removed unnecessary conditions
* onload fixed in feedback
* code refracted
* Removed add row button from Review and Customer Feedback
* made autofill feild read only
* automated scheduling of review
2018-12-25 17:42:31 +05:30
deepeshgarg007
64238ee91f
(Codacy Fix) Fixed indenttion
2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
Suraj Shetty
19f8e6bcf8
Fix typo
2018-12-25 15:30:09 +05:30
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue
...
[Fix] Tax Withholding, TDS is applying on the tax
2018-12-25 14:49:05 +05:30
Suraj Shetty
488aa86f70
Skip some codacy warnings
2018-12-25 14:46:44 +05:30
Suraj Shetty
8775204d63
Merge branch 'develop' into general-ui-fixes
2018-12-25 14:36:43 +05:30
Suraj Shetty
9180c48262
Fix patch entry
2018-12-25 14:34:38 +05:30
rohitwaghchaure
deb96dab3e
[Fix] Salary structure not saving ( #16275 )
2018-12-25 13:58:20 +05:30
Suraj Shetty
8d9960bdad
Fix patch entry
2018-12-25 12:33:37 +05:30
Suraj Shetty
bcd8f31e43
Add an entry of a patch in patches.txt
2018-12-25 11:16:49 +05:30
Rushabh Mehta
fafbb0278f
fix: reload parent after setting children
2018-12-24 22:09:15 +05:30
Rushabh Mehta
c9b1a35ac3
fix: set explicit idx for new item in update_child_qty_rate
2018-12-24 20:55:35 +05:30
Suraj Shetty
b763893f22
Fix quotes issue in item.js
2018-12-24 19:43:31 +05:30
Suraj Shetty
a3f28d40b0
Remove _label
2018-12-24 19:39:45 +05:30
Suraj Shetty
9c3dcfea76
Add a patch to rename accounts desktop icon to accounting
2018-12-24 17:00:40 +05:30
Suraj Shetty
67b311e95e
Make -> Create
2018-12-24 16:16:13 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Rushabh Mehta
5d11abb0a2
fix(escaping): accounts_receivable.py
2018-12-24 16:03:24 +05:30
Suraj Shetty
242b16fdfd
Rename Accounts -> Accounting
2018-12-24 15:47:23 +05:30
frappe-pr-bot
67121f6c91
[Translation] Updated Translations
2018-12-24 11:57:19 +02:00
Rohit Waghchaure
94500a9d62
[Fix] TDS is applying on the tax
2018-12-24 15:13:52 +05:30
rohitwaghchaure
7ec5e80b70
[Fix] While making sales invoice from delivery note, system not remove the returned qty ( #16141 )
2018-12-24 14:55:31 +05:30
Nabin Hait
5a9579bae4
feat(quality): Check quality status before receipt/delivery ( #16169 )
2018-12-24 14:54:42 +05:30
Valmik
78bc405eeb
fix: set fieldname for frappe prompt ( #16198 )
2018-12-24 14:54:06 +05:30
Navdeep Ghai
c4d38c0afc
Fix the disappears of image bug after uploading and saving the employee ( #16217 )
...
* Fix image disappears of image after uploading and saving the employee
* Fix the codacy issue
2018-12-24 14:53:19 +05:30
KanchanChauhan
1790a6faaa
Set ignore_user_permission 1 for Company field in Item Default ( #16167 )
2018-12-24 14:48:09 +05:30
Rohan
349040db6d
fix(work_order): Set operations for Work Order when created from MREQ ( #16154 )
2018-12-24 14:42:34 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +05:30
rohitwaghchaure
4265c5a772
Rename BOM and Work order fields ( #16209 )
...
* Rename BOM and Work order fields
* Rearranged BOM fields
2018-12-24 14:38:49 +05:30
Mangesh-Khairnar
70c5aa5f5d
[Enhancement] Pending SO Items for Purchase Request Report ( #16188 )
...
* deleted old purchase request query report
* [Enhancement] pending so items for purchase request report refactor
* comments and format fix
* test and minor fixes
* test fixes
2018-12-24 14:25:47 +05:30
Shreya Shah
91ddadeefa
fix: add currency to options ( #16199 )
2018-12-24 14:25:12 +05:30
Frappe PR Bot
25fc5b879b
[Translation] Updated Translations ( #16227 )
2018-12-24 14:22:35 +05:30
Charles-Henri Decultot
083f1c5370
Safe decode project name for languages with special characters ( #16254 )
2018-12-24 14:21:33 +05:30
Shreya Shah
d2b9093ecc
fix: Check if items exist ( #16248 )
2018-12-24 14:21:07 +05:30
Charles-Henri Decultot
9100740ba9
[Fix] FEC: Correction of the export function ( #16252 )
...
* Correction of the export function
* Improve JS code
* Codacy corrections
* Codacy corrections
2018-12-24 14:20:35 +05:30
Raffael Meyer
ed3561279d
Update README.md ( #16224 )
2018-12-24 14:19:51 +05:30
rohitwaghchaure
1c1798c7f2
[Fix] Warehouse wise item balance age and value report not working ( #16258 )
2018-12-24 14:19:27 +05:30
Deepesh Garg
3ae2517867
Removed subscriber option form module page ( #16270 )
2018-12-24 14:16:57 +05:30
