Compare commits

..

10422 Commits

Author SHA1 Message Date
Nabin Hait
7cd6022a0b Merge branch 'v12-pre-release' into version-12 2020-01-21 13:07:27 +05:30
Nabin Hait
67274d01e8 bumped to version 12.4.2 2020-01-21 13:27:26 +05:50
Nabin Hait
19d7e43b90 fix: Don't fetch price list rate on change of qty (#20360) 2020-01-21 13:04:30 +05:30
Sahil Khan
c8884257b9 Merge branch 'v12-pre-release' into version-12 2020-01-20 18:02:31 +05:30
Sahil Khan
4674fec320 bumped to version 12.4.1 2020-01-20 18:22:31 +05:50
rohitwaghchaure
c7f0ab8ed6 fix: incorrect number of gl entries issue (#20351) 2020-01-20 17:53:44 +05:30
Marica
8b943af911 fix: 'get_additonal_costs' is not defined (#20349)
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
2020-01-20 15:47:47 +05:30
Marica
863eb86a1d fix: 'get_additonal_costs' is not defined (#20345)
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
2020-01-20 15:46:50 +05:30
Nabin Hait
e5fbebe126 fix: deprecated fetching item price based on min_qty (#20348) 2020-01-20 15:45:09 +05:30
sahil28297
d5676a87a8 Merge pull request #20331 from 0Pranav/version-12
fix: imporer escaping
2020-01-16 17:51:32 +05:30
0Pranav
73dff8993a fix: imporer escaping 2020-01-16 17:38:11 +05:30
Sahil Khan
0ef799dff8 Merge branch 'v12-pre-release' into version-12 2020-01-16 14:30:35 +05:30
Sahil Khan
e8476ef42a bumped to version 12.4.0 2020-01-16 14:50:35 +05:50
Nabin Hait
9fef6e1b68 docs: Added change log for v12.4.0 (#20326) 2020-01-16 13:37:46 +05:30
Nabin Hait
37c51f5913 fix: Multiple fixes based on testing on pre-release branch (#20300)
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
2020-01-16 13:37:30 +05:30
Nabin Hait
7e33d875e0 Revert "fix: incorrect required qty for subcontracting purchase receipt (#20288)" (#20323)
This reverts commit b65b525c44.
2020-01-16 13:02:40 +05:30
sahil28297
ab2e52ca07 fix(patch): reload tax category (#20309) 2020-01-15 18:57:40 +05:30
sahil28297
dc0ea3fdb0 fix(patch): do not append taxes to template if account name is not set (#20310) 2020-01-15 18:57:08 +05:30
rohitwaghchaure
b65b525c44 fix: incorrect required qty for subcontracting purchase receipt (#20288) 2020-01-15 16:37:10 +05:30
rohitwaghchaure
4872417f86 fix: incorrect number of GL Entries error in stock entry (#20298) 2020-01-15 16:35:15 +05:30
Pranav Nachnekar
c50f08a23a fix: remove debugger statement (#20294)
introduced in https://github.com/frappe/erpnext/pull/20222
2020-01-15 14:49:42 +05:30
Saqib
2d37bbedaa fix: auto cancel if movement exists (#20268)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-14 12:42:43 +05:30
rohitwaghchaure
00f6f114e7 Merge pull request #20278 from rohitwaghchaure/fixed_report_stock_and_account_value_comparison_v12_pre_release
fix: filter issue for the stock and account value comparision report
2020-01-14 12:19:04 +05:30
Rohit Waghchaure
ca4789c9f7 fix: filter issue for the stock and account value comparision report 2020-01-14 12:17:27 +05:30
Saqib
d56bc81daf fix: gl not generated on manual asset creation (#20267) 2020-01-14 11:36:47 +05:30
Deepesh Garg
a14f72590d fix: Remove patch to set automatic tax fetching from item tax template (#20236)
* fix: Remove patch to set automatic tax fetching from item tax template

* fix: Remove duplicate patch
2020-01-13 15:09:16 +05:30
Saqib
4b401f0573 Merge pull request #20263 from nextchamp-saqib/customer-jv-fix-v12-pre
fix: remove default customer as party type
2020-01-13 14:12:22 +05:30
thefalconx33
5beee8af58 fix: remove default customer as party type 2020-01-13 13:51:17 +05:30
Deepesh Garg
f7cd8c2702 Merge pull request #20239 from deepeshgarg007/hsn_template_v12
fix: Item tax template fetching from HSN Code
2020-01-10 21:43:26 +05:30
deepeshgarg007
f67b3f8a79 fix: Item tax template fetching from HSN Code 2020-01-10 15:04:34 +05:30
Nabin Hait
8356d214e1 Merge branch 'version-12-hotfix' into v12-pre-release 2020-01-09 15:09:20 +05:30
rohitwaghchaure
64f3577148 feat: report to show difference between stock and account value (#20226) 2020-01-09 15:05:26 +05:30
Marica
ff3ff9a3c2 fix: Employee name in Report trial balance for party (#20224)
* fix: Employee name in Report trial balance for party

* fix: Add account filter in trial balance for party report

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-09 13:34:30 +05:30
Pranav Nachnekar
03c1396fc7 fix: Parent Item of Product Bundle should not appear in dialog (#20222)
* fix: add new delivery note button in Sales Order

* fix: parent item should not appear in raw material request dialog
2020-01-09 13:31:53 +05:30
Pranav Nachnekar
4479b93c1a fix: escape % in customer name (#20203)
* fix: add new delivery note button in Sales Order

* fix: escape % in customer name

* Update sales_order.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-09 12:22:11 +05:30
Anurag Mishra
da82edf711 fix: submit salary is not showing after creating slary slip in payroll (#20225) 2020-01-09 12:06:14 +05:30
Saqib
7b8bf4f4d4 Merge pull request #20213 from nextchamp-saqib/pay-entry-v12
fix: paid amount gets overwritten by get_outstanding_invoices
2020-01-07 13:33:16 +05:30
thefalconx33
07c915d00b fix: paid amount gets overwritten by get_outstanding_invoices 2020-01-07 13:14:01 +05:30
Marica
75b62cdd9f fix: Added description and title to supplier selection popup in Material Request. (#20180) 2020-01-07 13:06:13 +05:30
Don-Leopardo
54f2d53522 fix: get_item_price not working properly (#20206)
* fix: min_qty not working without party and valid_from not being used to order results

* fix: fetch price on item qty change
2020-01-07 11:35:56 +05:30
Deepesh Garg
55bdaae3ee feat: Validity for Item taxes (#20136)
* feat: Validity for Item taxes

* fix: Add HSN wise taxes

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
2020-01-07 11:31:19 +05:30
sahil28297
6bbfce13fe fix(item_tax_template): fetch parent account if not set (#20197) 2020-01-07 11:30:18 +05:30
Pranav Nachnekar
0980ebe93e fix: add new delivery note button in Sales Order (#20200)
* fix: add new delivery note button in Sales Order

* fix: removed debugger

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-07 11:29:45 +05:30
Rohan
ded5a255af fix: integer UOM check in transactions (#20177) 2020-01-07 11:24:02 +05:30
Anurag Mishra
13c29aeec4 fix: loan deduction during creation of bank entry in payroll (#20194) 2020-01-07 11:13:58 +05:30
rohitwaghchaure
cf261d0788 Merge pull request #20196 from rohitwaghchaure/fixed_party_type_in_payment_request_hotfix
fix: incorrect party type in payment request
2020-01-06 15:16:30 +05:30
Rohit Waghchaure
3074679d7e fix: party type in payment request 2020-01-06 15:09:09 +05:30
rohitwaghchaure
a037f9d55e Merge pull request #20171 from nabinhait/inter-company-serial-no-outgoing-rate-v12
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
2020-01-06 12:06:08 +05:30
rohitwaghchaure
3530d0d7c9 fix: incorrect valuation rate for finished good entry (#20166) 2020-01-06 11:51:36 +05:30
Deepesh Garg
3da9967fa8 Merge pull request #20178 from Alchez/fix-v12-item-price-list-view
feat: show item name in Item Price list view (v12)
2020-01-06 08:06:07 +05:30
Himanshu
f276e8d6a1 fix(plaid): change json structure (#20190) 2020-01-06 01:01:37 +05:30
Rohan
9e0d9aa947 feat: show item name in Item Price list view (#20156) 2020-01-03 15:21:58 +05:30
Marica
df363d7dd6 Merge pull request #20173 from nextchamp-saqib/item-min-qty-v12
ux: add description for minimum purchase qty
2020-01-03 12:54:45 +05:30
thefalconx33
81e2f2a45f ux: add description for minimum purchase qty 2020-01-02 19:16:36 +05:30
Nabin Hait
255361ba92 fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company 2020-01-02 19:01:48 +05:30
rohitwaghchaure
67bcfde3de Merge pull request #20168 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule
fix: ignore pricing rule for other item group
2020-01-02 17:32:43 +05:30
Rohit Waghchaure
b6351b4ca0 fix: ignore pricing rule for other item group 2020-01-02 17:29:50 +05:30
Deepesh Garg
c5a8d33374 Merge pull request #20162 from deepeshgarg007/general_ledger_print_v12
fix: Show closing row in general ledger print
2020-01-02 17:06:05 +05:30
deepeshgarg007
f4589da806 fix: Show closing row in general ledger print 2020-01-02 12:26:12 +05:30
Rucha Mahabal
c5cd7cd65d fix(Subscription): pass start_date while computing next_schedu… (#20160) 2019-12-31 19:15:48 +05:30
Anurag Mishra
a5e56dfb6f fix: set currency to company default currency (#20158) 2019-12-31 17:23:25 +05:30
Saqib
adb35d8703 fix: don't show transfer button if already items are supplied (#20155) 2019-12-31 17:20:07 +05:30
Deepesh Garg
db4f3d98ab Merge pull request #20150 from nextchamp-saqib/rounded-total-ss-v12
feat: added provision to disable rounded total for salary slips
2019-12-31 17:03:11 +05:30
thefalconx33
cd2899f429 feat: added provision to disable rounded total for salary slips 2019-12-31 15:29:36 +05:30
thefalconx33
8f6a6e8d2a feat: added provision to disable rounded total for salary slips 2019-12-31 14:35:03 +05:30
Anurag Mishra
fd68a682ca fix(refactor): loan in HRMS (#20023)
* fix: update laon on salary slip submission and Cancelation

* fix(refactor): Loan in HRMS

* fix: Changes requested

* Update loan.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-31 14:01:22 +05:30
Saqib
25fd2743a8 fix: party account currency not fetched from account for SO (#20147) 2019-12-31 13:55:34 +05:30
Saqib
826989afda fix: none type object updates AR report row (#20148) 2019-12-31 13:46:39 +05:30
Marica
10622aee7f fix: Field 'other_charges_calculation' column type changed. (#20142) 2019-12-30 22:20:27 +05:30
Anurag Mishra
26e86e7576 fix: added extra condition (#20139) 2019-12-30 16:17:10 +05:30
Rucha Mahabal
efa7d5c831 fix: format currency field in bank and cash payment voucher print format (#20138) 2019-12-30 15:18:02 +05:30
rohitwaghchaure
55cf2477cd fix: incorrect batch fetched for the serialized items (#20118) 2019-12-30 13:27:10 +05:30
ci2014
5c144c992e Skip validate_duplicate_apply_on if not necessary (#20128)
Skip the validation of duplicate fields if the type is transaction, for example.
2019-12-30 11:50:43 +05:30
rohitwaghchaure
2fcc51dece fix: service item's cost showing incorrect amount in stock entry (#20105) 2019-12-30 11:42:01 +05:30
Deepesh Garg
e76670562c Merge pull request #20124 from nextchamp-saqib/so-update-items-hfix
fix: don't allow deletion of items which has work order assigned to it
2019-12-28 21:01:47 +05:30
Deepesh Garg
e1aa48968e Merge pull request #20126 from marination/stock-module-desk-hotfix
chore: Added Reports to Stock Module Desk
2019-12-28 17:45:31 +05:30
marination
2faa8f92be chore: Added Reports to Stock Module Desk 2019-12-27 17:21:08 +05:30
thefalconx33
82c5a2bf45 fix: don't allow deletion of items which has work order assigned to it 2019-12-27 17:08:57 +05:30
Marica
ed386376dc fix: Removed unneccesary Duplicate Entry Error. (#20121) 2019-12-27 16:53:09 +05:30
Marica
65353e5590 fix: Show both warehouse columns in Stock Entry Grid view. (#20114) 2019-12-27 15:30:47 +05:30
Saqib
aab1fb0d6a fix: unpaid invoices are created even if current invoice is paid (#20082) 2019-12-27 13:02:33 +05:30
Deepesh Garg
2dec923740 fix: Patch incorrect GST category in invoices (#20085)
* fix: Patch to set GST category for unregistered invoice

* fix: Move patch up in line

* fix: Remove unwanted patch statements
2019-12-27 12:58:38 +05:30
Saqib
6ea509f7f4 feat: allow adding and deleting of items in submitted SO & PO (#19912)
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-27 12:56:17 +05:30
Sammish Thundiyil
dfdd684fbf modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json (#20112) 2019-12-27 12:52:40 +05:30
rohitwaghchaure
b299026280 fix: incorrect reorder level in stock balance report (#20110) 2019-12-27 12:36:14 +05:30
Rohan
3d2e61eef3 fix: Add Serial No button prompt (#20098) 2019-12-27 12:34:43 +05:30
rohitwaghchaure
47eda0fa6d fix: incorrect validation for scrap items (#20108) 2019-12-27 12:21:10 +05:30
Mangesh-Khairnar
8ec1d8d5da fix: fetch opening accumulated depreciation (#20096) 2019-12-27 12:14:27 +05:30
rohitwaghchaure
6adf617a72 Merge pull request #20078 from nabinhait/rounding-adjustment-v12
fix: rounding adjustment while both inclusive tax and discount amount present
2019-12-27 11:52:10 +05:30
Deepesh Garg
7c7291ed4f Merge pull request #20088 from nextchamp-saqib/pay-reco-hfix
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-27 08:12:33 +05:30
rohitwaghchaure
a169292f6e Merge pull request #20103 from deepeshgarg007/travis-fix-v12
fix: Travis(v12)
2019-12-26 22:51:13 +05:30
thefalconx33
5869757860 fix: travis failing for leave application test 2019-12-26 21:52:54 +05:30
Deepesh Garg
6fefdb5b18 Merge pull request #20092 from nextchamp-saqib/account-period-hfix
fix: only show doctypes which impact accounting in accounting period
2019-12-26 15:23:54 +05:30
Saqib
8c08db33d7 Merge pull request #20094 from prssanna/grid-fix-v12
fix: wrong items in table being deleted
2019-12-26 14:54:16 +05:30
prssanna
bc15ea68b8 fix: wrong items in table being deleted 2019-12-26 14:44:47 +05:30
thefalconx33
ee28663836 fix: undefined dr_or_cr_notes in case of party type Employee 2019-12-26 14:43:03 +05:30
thefalconx33
c522df8f9d fix: only show doctypes which impact accounting in accounting period 2019-12-26 13:56:36 +05:30
Himanshu
d0e39e6fac fix: remove quote (#20077) 2019-12-25 15:16:35 +05:30
Nabin Hait
4c4da06a71 fix: rounding adjustment while both inclusive tax and discount amount present 2019-12-25 14:00:51 +05:30
rohitwaghchaure
827ac91e7f fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20070) 2019-12-24 13:03:41 +05:30
Deepesh Garg
379b6df361 Merge pull request #20008 from deepeshgarg007/budget_variance_dimension_v12
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:58:22 +05:30
Deepesh Garg
2e461551d6 fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20059) 2019-12-24 12:55:18 +05:30
Himanshu
2d30dc583c fix: resolve ambigious error (#20067) 2019-12-24 12:31:34 +05:30
Sun Howwrongbum
9de6083dbf feat: consider expiry_date during Batch queries (#20064) 2019-12-24 12:29:05 +05:30
RJPvT
9512e55704 Update supplier_scorecard.py (#20060) 2019-12-24 12:25:05 +05:30
rohitwaghchaure
9635df4f26 Merge pull request #20066 from rohitwaghchaure/job_card_operation_id_showing_blank
fix: Map custom job card create button with dashboard
2019-12-24 12:11:16 +05:30
Rohit Waghchaure
7bbeb31015 fix: Map custom job card create button with dashboard 2019-12-24 12:08:58 +05:30
Deepesh Garg
1f4b251f53 Merge pull request #20045 from deepeshgarg007/employee_advance_return_v12
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:55:24 +05:30
Deepesh Garg
34dabc715b fix: Update return amount label 2019-12-24 11:54:04 +05:30
DeeMysterio
3881ce94ef fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20054) 2019-12-23 19:02:44 +05:30
Marica
065bbc9cb3 enhancement: Added Set Reserve Warehouse field in Purchase Order. (#19992) 2019-12-23 18:24:28 +05:30
Pranav Nachnekar
139bb92df9 fix: wrap scheduled_time with getdate (#20046) 2019-12-23 18:19:52 +05:30
Deepesh Garg
15c8caac57 fix: Do not validate accounting dimensions if from repost (#20043)
* fix: Do not check for accounting dimensions in case of repost

* fix: Do not validate accounting dimensions if from repost
2019-12-23 17:58:44 +05:30
Saqib
7b926f228f fix: bad condition while checking last asset movement entry (#20048) 2019-12-23 16:08:40 +05:30
Saqib
dab963aac0 fix: remove mandatory purchase reference for existing asset (#19981) 2019-12-23 15:56:50 +05:30
Saqib
170c9d0ab8 fix: remove mandatory purchase reference for existing asset (#19980) 2019-12-23 15:56:44 +05:30
Saqib
f27a6528db fix: exchange rate not fetching correctly (#19985) 2019-12-23 15:52:59 +05:30
Anurag Mishra
b139f2fc0f feat: fixed party and party type in Accrual journal entry (#20022) 2019-12-23 15:50:20 +05:30
Mangesh-Khairnar
498ebfba9d fix(expense-claim): update status (#20032)
* fix(expense-claim): update status

* fix(expense-claim): compare using grandtotal precision
2019-12-23 15:48:18 +05:30
Deepesh Garg
2ebafb39ac Merge pull request #20011 from nextchamp-saqib/pi-payable-filter-hotfix
fix: bad credit to filter query in purchase invoice
2019-12-23 14:51:50 +05:30
thefalconx33
adc1b9dc0a fix: bad query for debit_to field in sales invoice 2019-12-23 13:08:46 +05:30
deepeshgarg007
b7012a47a2 fix: Remove trailing whitespace and add semicolon 2019-12-23 11:13:53 +05:30
deepeshgarg007
f1036c6985 feat: Custom button to create return entry from Employee Advance 2019-12-23 11:13:44 +05:30
deepeshgarg007
8f6e989f57 feat: Capture return amount against Employee advance via Journal Entry 2019-12-23 11:13:34 +05:30
deepeshgarg007
9609cce7b7 fix: Dashboard for employee advance doctype 2019-12-23 11:13:24 +05:30
Deepesh Garg
e14961a6c6 Merge pull request #20013 from nextchamp-saqib/share-transf-perm
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:22:15 +05:30
Deepesh Garg
f47afecc42 Merge pull request #20035 from rohitwaghchaure/fixed_patch_for_add_export_type_field_in_party_master_v12_hotfix
fix: patch
2019-12-21 17:20:28 +05:30
Sahil Khan
782f45ae5f Merge branch 'v12-pre-release' into version-12 2019-12-20 17:11:52 +05:30
Sahil Khan
f9ac8f63cf bumped to version 12.3.1 2019-12-20 17:31:52 +05:50
sahil28297
411b8e86b3 Merge pull request #20036 from rohitwaghchaure/fixed_patch_for_add_export_type_field_in_party_master_v12_pre_release
fix: patch
2019-12-20 17:09:09 +05:30
Rohit Waghchaure
2b14669b58 fix: patch 2019-12-20 17:06:57 +05:30
Rohit Waghchaure
14f624f587 fix: patch 2019-12-20 17:06:00 +05:30
Sahil Khan
98ddbf05b1 Merge branch 'v12-pre-release' into version-12 2019-12-20 15:55:12 +05:30
Sahil Khan
67d25028b2 bumped to version 12.3.0 2019-12-20 16:15:12 +05:50
Mangesh-Khairnar
328d5920bd fix(expense-claim): update status (#20033)
* fix(expense-claim): update status

* fix(expense-claim): compare using grandtotal precision
2019-12-20 15:26:49 +05:30
rohitwaghchaure
81d614b6bd Merge pull request #20007 from 0Pranav/appointment-schedulling-v12
fix: multiple issues with appointment schedulling
2019-12-20 15:17:41 +05:30
rohitwaghchaure
fdb7cec244 Merge pull request #20006 from 0Pranav/appointment-schedulling-v12
fix: multiple issues with appointment schedulling
2019-12-20 15:17:23 +05:30
thefalconx33
3aabeb88b4 fix: account manager doesn't have cancel submit perm for share transfer 2019-12-20 14:49:18 +05:30
rohitwaghchaure
b7fd9a652d Merge pull request #19929 from 0Pranav/delete-company-txn-query-v12
fix: replace sql with orm query for deleting company communications
2019-12-20 13:48:23 +05:30
rohitwaghchaure
63bc8f2d90 Merge pull request #20026 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt
fix: incorrect consumed qty for partial purchase receipt in subcontra…
2019-12-20 13:36:06 +05:30
rohitwaghchaure
b6d7fba936 Merge pull request #20025 from deepeshgarg007/gstr-2-fix-v12
fix: Tax amount not visible for some invoices
2019-12-20 13:35:41 +05:30
rohitwaghchaure
38540e85e8 Merge pull request #20029 from deepeshgarg007/gstr-2-fix-v12
fix: Tax amount not visible for some invoices
2019-12-20 13:35:14 +05:30
rohitwaghchaure
b3d97a560f Merge pull request #20027 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt_pre_release
fix: incorrect consumed qty for partial purchase receipt in subcontra…
2019-12-20 13:05:19 +05:30
Rohit Waghchaure
39436c6d38 fix: incorrect consumed qty for partial purchase receipt in subcontracting 2019-12-20 12:59:56 +05:30
Rohit Waghchaure
59cecb29a0 fix: incorrect consumed qty for partial purchase receipt in subcontracting 2019-12-20 12:56:01 +05:30
deepeshgarg007
55bf951ff5 fix: Tax amount not visible for some invoices 2019-12-20 12:43:55 +05:30
Deepesh Garg
4f543ce42a Merge pull request #20015 from marination/valuation_rate_company_hotfix
fix: Company None not found in get_valuation_rate
2019-12-20 11:56:58 +05:30
Deepesh Garg
8931b3d602 Merge pull request #19989 from deepeshgarg007/sales_register_upgrade_v12
fix: Update sales register report
2019-12-19 13:53:35 +05:30
marination
b13eebe657 fix: Company None not found in get_valuation_rate 2019-12-19 13:39:41 +05:30
thefalconx33
fcb296aafb fix: no role has cancelling permission for share transfer doctype 2019-12-19 13:19:50 +05:30
thefalconx33
5109b36689 fix: bad filter query 2019-12-19 13:12:37 +05:30
deepeshgarg007
2149d7ca4f feat: Dynamic filters for dimensions in budget variance report 2019-12-19 13:05:52 +05:30
0Pranav
220a208f4e fix: default timezone selection 2019-12-19 12:28:12 +05:30
0Pranav
0c8e46fdea fix: remove timezones in js 2019-12-19 12:25:29 +05:30
Deepesh Garg
ee4901f4a0 Merge pull request #19990 from 0Pranav/mapped-doc-for-customer-quotation-v12
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 12:00:53 +05:30
Deepesh Garg
a0c847920f Merge pull request #19984 from 0Pranav/mapped-doc-for-customer-quotation-v12
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 12:00:23 +05:30
rohitwaghchaure
86e5ff3cf9 Merge pull request #19997 from rohitwaghchaure/fixed_pricing_rule_issue_for_product_discount_v12_hotfix
fix: Pricing Rule Discount for Product
2019-12-19 11:12:15 +05:30
rohitwaghchaure
5dd7503516 Merge pull request #19995 from rohitwaghchaure/fixed_pricing_rule_issue_for_product_discount_pre_relesae
fix: Pricing Rule Discount for Product
2019-12-19 11:11:37 +05:30
deepeshgarg007
5cc0e08a41 fix: Use get_value instead of get_doc and formatting 2019-12-19 11:07:43 +05:30
Rohit Waghchaure
6b00d60b46 fix: Pricing Rule Discount for Product 2019-12-18 17:54:28 +05:30
Rohit Waghchaure
fecf5a9a15 fix: Pricing Rule Discount for Product 2019-12-18 17:48:39 +05:30
0Pranav
5b4050a4ff add link to appointment booking in sidebar 2019-12-18 16:30:54 +05:30
0Pranav
4d7862ef4c fix: defualt timezone not getting selected 2019-12-18 16:27:16 +05:30
0Pranav
6e41475612 fix : only set price list if it exists for customer 2019-12-18 16:05:59 +05:30
sahil28297
803e0ec27c Merge pull request #19988 from rohitwaghchaure/change_log_for_v12_3_0
feat: v12_3_0 change log
2019-12-18 15:54:37 +05:30
Rohit Waghchaure
b3addff99e v12_3_0 change log 2019-12-18 15:49:32 +05:30
deepeshgarg007
c6e098881f fix: Update sales register report 2019-12-18 15:43:14 +05:30
0Pranav
200ceb5352 use open_mapped_doc instead of create_new_doc 2019-12-18 12:34:19 +05:30
rohitwaghchaure
8c50f5c23f Merge pull request #19977 from Mangesh-Khairnar/fix-compensatory-off-pre
fix: compensatory off leave creation
2019-12-18 11:29:18 +05:30
rohitwaghchaure
6351a9395c Merge pull request #19975 from rohitwaghchaure/not_able_to_make_work_order_from_bom_v12_hotfix
fix: not able to make work order from BOM
2019-12-18 11:12:45 +05:30
Rushabh Mehta
fb2153c0eb Merge pull request #19966 from alyf-de/version-12-hotfix
fix(regional): Py3 compatibility for DATEV Export
2019-12-18 08:48:50 +05:30
Mangesh-Khairnar
86600ac8b9 fix: allow creation of additional leave ledger entry 2019-12-17 18:37:15 +05:30
Mangesh-Khairnar
b76a04b470 fix: compensatory leave request creation 2019-12-17 18:37:09 +05:30
Rohit Waghchaure
bb42fc615e fix: not able to make work order from BOM 2019-12-17 18:18:17 +05:30
rohitwaghchaure
80913994da Merge pull request #19974 from rohitwaghchaure/not_able_to_make_work_order_from_bom
fix: not able to make work order from BOM
2019-12-17 18:15:37 +05:30
Rohit Waghchaure
92ecdbe0c8 fix: not able to make work order from BOM 2019-12-17 18:13:54 +05:30
rohitwaghchaure
089dcaed70 Merge pull request #19969 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:28 +05:30
Mangesh-Khairnar
03a427a9e7 Merge pull request #19961 from Mangesh-Khairnar/compensatory-off-fix
fix: compensatory leave request creation
2019-12-17 13:32:05 +05:30
Rohit Waghchaure
764c2c7f17 fix: incorrect outstanding amount shwoing in the AP/AR report 2019-12-17 12:44:19 +05:30
Mangesh-Khairnar
b4d9b80fed fix: allow creation of additional leave ledger entry 2019-12-17 12:25:25 +05:30
Raffael Meyer
215274719e fix(regional): PY3 compatibility 2019-12-16 17:33:44 +01:00
rohitwaghchaure
c920efc156 Merge pull request #19963 from rohitwaghchaure/allow_overproduction_against_work_order_version_12_hotfix
fix: not allow to over production against work order
2019-12-16 18:04:27 +05:30
rohitwaghchaure
3b9fe1ae6f Merge pull request #19959 from rohitwaghchaure/fixed_incorrect_child_bom_fecthed
fix: incorrect child boms fetched
2019-12-16 17:00:08 +05:30
Rohit Waghchaure
c76c5e699b fix: now allow to over production against work order 2019-12-16 16:59:01 +05:30
Mangesh-Khairnar
ce6923ecb6 fix: compensatory leave request creation 2019-12-16 16:56:57 +05:30
0Pranav
03db85f3e7 fix: replace sql query by orm in delete_communications and added tests 2019-12-16 16:54:03 +05:30
Rohit Waghchaure
666fba94e2 fix: incorrect children boms fetched 2019-12-16 16:18:33 +05:30
rohitwaghchaure
48a8a40703 Merge pull request #19944 from nextchamp-saqib/gl-precision-hotfix
fix: gl entries doesn't filter based on debit precision
2019-12-16 15:29:04 +05:30
rohitwaghchaure
5646816282 Merge pull request #19870 from nextchamp-saqib/website-hotfix
fix: website showing disabled items in product list
2019-12-16 15:25:07 +05:30
thefalconx33
f8df3c7af2 fix: review changes 2019-12-16 15:03:27 +05:30
rohitwaghchaure
62d4dfa883 Merge pull request #19956 from nextchamp-saqib/pos-serial-no
fix: display serial no selection on adding items to cart
2019-12-16 14:54:23 +05:30
thefalconx33
b8f9fd023b fix: display serial no selection on adding items to cart 2019-12-16 14:49:59 +05:30
rohitwaghchaure
0df3c93737 Merge pull request #19936 from benknowles/patch-3
fix: task validation error when adding tasks to projects
2019-12-16 14:01:20 +05:30
rohitwaghchaure
e0e7dcd2f6 Merge pull request #19914 from nextchamp-saqib/cart-address-hotfix
fix: enable adding of address without enabling checkout feature
2019-12-16 13:52:48 +05:30
rohitwaghchaure
d5b1baed39 Merge pull request #19907 from 0Pranav/appointment-schedulling-v12
fix: change book-appointment route
2019-12-16 13:50:47 +05:30
rohitwaghchaure
800545ff5b Merge pull request #19947 from rohitwaghchaure/pricing_rule_not_working_for_product_discount_v12_hotfix
fix: pricing rule not working for product discount
2019-12-16 13:37:45 +05:30
rohitwaghchaure
388a177f75 Merge pull request #19939 from marination/item_manufacturer_table
fix(ui): Removed 'manufacturers' table from Item Master
2019-12-16 13:36:56 +05:30
Rohit Waghchaure
821166c628 fix: schedule date 2019-12-16 12:29:39 +05:30
marination
2b8df06f8e fix: Removed validation from non existent manufacturers table 2019-12-16 12:18:24 +05:30
Rohit Waghchaure
4e8e466a98 fix: pricing rule not working for production discount 2019-12-16 11:16:36 +05:30
Deepesh Garg
31d4482336 Merge pull request #19953 from surajshetty3416/fix-profit-and-loss-statement-version-12-hotfix
fix: Profit and Lost (financial statement) report
2019-12-15 20:23:05 +05:30
Suraj Shetty
5cd8c7c722 fix: Financial statement report
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
2019-12-14 23:33:14 +05:30
Deepesh Garg
e14d9b5476 Merge pull request #19951 from deepeshgarg007/patch-and-address-fix-v12
fix: Add missing import
2019-12-14 23:03:27 +05:30
deepeshgarg007
6a8ff1bebe fix: Add missing import 2019-12-14 21:31:11 +05:30
rohitwaghchaure
a41d464198 Merge pull request #19942 from deepeshgarg007/pricing_rule_fix_v12
fix: Price rule filtering fix
2019-12-13 16:01:35 +05:30
thefalconx33
980793bde0 fix: gl entries doesn't filter based on debit precision 2019-12-13 15:42:34 +05:30
deepeshgarg007
b7329eac19 fix: Price rule filtering fix 2019-12-13 13:49:12 +05:30
marination
9ec5cb2570 fix: Removed 'manufacturers' table from Item Master 2019-12-13 13:12:10 +05:30
Deepesh Garg
44296a392d Merge pull request #19735 from marination/zero-division-v12-hotfix
fix: Division by zero error in Stock Entry
2019-12-13 09:24:31 +05:30
Ben Knowles
9097c7e11c fix: task validation error when adding tasks to projects
Related to PR #19919
2019-12-12 11:30:17 -06:00
Deepesh Garg
0256d7549c Merge pull request #19931 from deepeshgarg007/regional_address_fix_v12
fix: Get regional address details
2019-12-12 16:54:34 +05:30
marination
94d8b99ef9 fix: Distribute charges based on quantity if Total Basic Amount is Zero. 2019-12-12 16:51:11 +05:30
Deepesh Garg
3fe1335f7b Merge pull request #19926 from prssanna/file-upload-fix-v12
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:36 +05:30
Deepesh Garg
dc7a4ac8af Merge pull request #19925 from rohitwaghchaure/not_able_to_submit_the_landed_cost_voucher_version_12
fix: not able to submit the landed cost voucher
2019-12-12 15:17:05 +05:30
Deepesh Garg
c0ff769214 Merge pull request #19924 from rohitwaghchaure/not_able_to_submit_the_landed_cost_voucher_version_12_hotfix
fix: not able to submit the landed cost voucher
2019-12-12 15:16:31 +05:30
deepeshgarg007
0a527b9f9a fix: Get regional address details fix 2019-12-12 15:13:30 +05:30
prssanna
e03871f9de fix: empty fname and fcontent of uploaded file 2019-12-12 12:22:03 +05:30
Rohit Waghchaure
c0286780bd fix: not able to submit the landed cost voucher 2019-12-12 12:14:26 +05:30
Rohit Waghchaure
9cc484650b fix: not able to submit the landed cost voucher 2019-12-12 12:13:40 +05:30
rohitwaghchaure
319f126258 Merge pull request #19901 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher_v12
fix: not able to cancel the landed cost voucher
2019-12-12 12:11:02 +05:30
0Pranav
234de12836 fix: add init files for book-appointments 2019-12-12 11:20:31 +05:30
rohitwaghchaure
4c19000ed9 Merge pull request #19918 from rohitwaghchaure/fixed_pricing_rule_working_on_other_items_v12_cherry_pick
fix: pricing rule not working
2019-12-12 10:20:05 +05:30
Deepesh Garg
a1651ca5f2 Merge pull request #19898 from hrwX/qms-int-fix-v12
fix: rename labels
2019-12-12 08:45:20 +05:30
Rohit Waghchaure
4d042cd81a Merge branch 'version-12' into fixed_pricing_rule_working_on_other_items_v12_cherry_pick 2019-12-11 22:53:27 +05:30
rohitwaghchaure
d72fae670a Merge pull request #19916 from rohitwaghchaure/fixed_pricing_rule_working_on_other_items
fix: pricing rule working on non pricing rule items
2019-12-11 22:18:07 +05:30
Rohit Waghchaure
d458e25dc5 fix: pricing rule working on non pricing rule items 2019-12-11 21:55:28 +05:30
Deepesh Garg
43474a3afa Merge pull request #19896 from hrwX/project-fix_v12
fix: Set project in child table via dashboard
2019-12-11 18:43:29 +05:30
Deepesh Garg
7daa2a2085 Merge pull request #19894 from marination/rounded_total_v12_hotfix
fix: Disable Rounded Total always showing field default value
2019-12-11 18:41:25 +05:30
Deepesh Garg
45075d8915 Merge pull request #19900 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher_v12_hotfix
fix: not able to cancel the landed cost voucher
2019-12-11 18:37:34 +05:30
thefalconx33
1de3040ecb fix: additional notes from Quotations not saved in SO 2019-12-11 18:11:48 +05:30
thefalconx33
af10f659d9 fix: enable address without checkout feature
* fix add address form country link field
2019-12-11 17:44:08 +05:30
thefalconx33
6f36691c64 fix: handle scenario with no condition 2019-12-11 16:10:56 +05:30
0Pranav
dfe629aff7 fix: change book-appointment route 2019-12-11 15:18:59 +05:30
Rohit Waghchaure
23bf2a6647 fix: not able to cancel the landed cost voucher 2019-12-11 13:52:47 +05:30
Rohit Waghchaure
b69cb8080c fix: not able to cancel the landed cost voucher 2019-12-11 13:52:18 +05:30
Himanshu Warekar
f23b5ed23b fix: rename labels 2019-12-11 13:10:31 +05:30
Himanshu Warekar
0a28387c70 fix: set project 2019-12-11 12:49:43 +05:30
marination
caae8c57bc fix: Disable Rounded Total always showing field default value 2019-12-11 12:18:51 +05:30
Nabin Hait
44ae135c36 Merge branch 'version-12' into version-12-hotfix 2019-12-11 09:12:10 +05:30
Deepesh Garg
47e786ef62 fix: Rounding Adjustment GL entry fix (#19839)
* fix: Rounding Adjustment GL entry fix

* fix: Spacing in tab

* fix: Comment fix
2019-12-11 09:06:37 +05:30
Deepesh Garg
f10be395c1 fix: NoneType' object has no attribute '__getitem_'_ (#19860) 2019-12-11 09:06:25 +05:30
rohitwaghchaure
ac967d09ec fix: Item-wise Sales History report not working (#19890) 2019-12-10 21:34:20 +05:30
Saqib
d1e8e8652f fix: incorrect account mapping for child companies (#19888)
* fix: incorrect account mapping for child companies on adding account to parent company

* Update account.py
2019-12-10 21:32:57 +05:30
Deepesh Garg
72649c207f feat(regional): Auto state wise taxation for GST India (#19877)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Update patches

* fix: Remove changes in patches.txt

* fix: Iteritems compatibility for python 3
2019-12-10 15:54:29 +05:30
Deepesh Garg
d06b685fdf fix: Append expense account only if expense account exists (#19881) 2019-12-10 12:15:06 +05:30
marination
6411a56cdc fix: Changed check condition and added test 2019-12-09 21:36:02 +05:30
Saqib
34b3b04fb0 fix: error message displays asset category as None (#19874)
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
2019-12-09 19:06:14 +05:30
Deepesh Garg
b1a2a16f43 Merge pull request #19868 from nextchamp-saqib/report-col-hotfix
fix: column data not visible after manual selection of columns
2019-12-09 17:57:41 +05:30
thefalconx33
f092e68a58 fix: website showing disabled items in product list 2019-12-09 17:03:32 +05:30
thefalconx33
6d497ccb4c fix: column data not visible after manual selection of columns 2019-12-09 15:24:39 +05:30
Deepesh Garg
a7b97f7bac Merge pull request #19867 from nextchamp-saqib/cart-fix-hotfix
fix: Error while placing order of cart items added yesterday
2019-12-09 15:23:04 +05:30
thefalconx33
f40d3bd10f fix: due date before posting date for items added to cart yesterday 2019-12-09 14:07:25 +05:30
Deepesh Garg
1e2be32860 fix: Consistency in button positions in Sales Order and Purchase Order (#19834) 2019-12-09 13:04:58 +05:30
Deepesh Garg
6aec9e32d4 fix: Rounding Adjustment GL entry fix (#19839)
* fix: Rounding Adjustment GL entry fix

* fix: Spacing in tab

* fix: Comment fix
2019-12-09 13:03:02 +05:30
Deepesh Garg
59cc0e5029 fix: NoneType' object has no attribute '__getitem_'_ (#19860) 2019-12-09 11:28:35 +05:30
Deepesh Garg
851f39cee1 Merge pull request #19837 from deepeshgarg007/gst_1_validation_msg_v12
fix: Validation msg fix in GSTR-1 report
2019-12-07 19:53:03 +05:30
rohitwaghchaure
6822a30f8c Merge pull request #19850 from rohitwaghchaure/fixed_timsheet_overlap_issue_v12_hotfix
fix: timesheet overlap error
2019-12-07 14:10:54 +05:30
Rohit Waghchaure
495ba1618b fix: timsheet overlap error 2019-12-07 13:22:08 +05:30
deepeshgarg007
778d7595aa fix: Add missing semicolon 2019-12-06 20:00:56 +05:30
deepeshgarg007
a40dbd0384 fix: Validation msg fix in GSTR-1 report 2019-12-06 19:46:32 +05:30
Deepesh Garg
80dfb9f834 Merge pull request #19835 from deepeshgarg007/accounts_payable_terms_v12
feat: Accounts Payable report based on payment terms
2019-12-06 19:41:27 +05:30
deepeshgarg007
dabb303358 feat: Accounts Payable report based on payment terms 2019-12-06 17:52:48 +05:30
Pranav Nachnekar
d16ef54665 fix: query for finding lost quotation (#19801)
* fix:query for finding lost quotation

* Update opportunity.py
2019-12-04 15:31:25 +05:30
Nabin Hait
dc248b9458 optimize: Optimization of Receivable report filtered based on sales person (#19797) 2019-12-04 15:30:39 +05:30
Nabin Hait
bf0f26b4a4 fix: Service start and end date validation for deferred accounting (#19806) 2019-12-04 15:29:54 +05:30
Mangesh-Khairnar
929fd4ce47 enhancement(fixed-asset-register): add date filter (#19804)
* feat: add date filter in the fixed asset register

* fix: remove function from keyword argument
2019-12-04 14:10:41 +05:30
Deepesh Garg
81c895b21e Merge pull request #19793 from nabinhait/ar-summary-based-on-terms-v12
feat: Receivable / payable summary based on payment terms
2019-12-04 11:23:31 +05:30
Shivam Mishra
27a21f80d7 feat: allow searching from meta fields (#19725)
* feat: allow searching from meta fields

* feat: remove description in query based on number of items
2019-12-03 17:26:50 +05:30
sahil28297
aa7085e11c fix(patch): set proper tax_type based on company and set proper account if not already present (#19788) 2019-12-03 17:07:26 +05:30
Nabin Hait
6e5363ba48 feat: Receivable / payable summary based on payment terms 2019-12-03 16:58:02 +05:30
Deepesh Garg
53746636c3 fix: Party name field in trial balacne for party report (#19790) 2019-12-03 16:30:09 +05:30
Deepesh Garg
485d48c101 fix: Unable to see parties with negative balance in AR/AP Summary (#19777) 2019-12-03 15:12:28 +05:30
Marica
0e1ef35968 fix: Item qty cannot be zero in Purchase Receipt (#19780) 2019-12-03 12:59:15 +05:30
gavin
35effe9be0 fix: AttributeError on new Student creation (#19787) 2019-12-03 12:54:18 +05:30
Shivam Mishra
648d6e46f3 fix: query for item group listing (#19785) 2019-12-03 12:52:58 +05:30
Nabin Hait
d6d9a3ddd7 Update employee.py 2019-12-03 12:52:12 +05:30
Deepesh Garg
18f05db19a Merge pull request #19763 from Mangesh-Khairnar/fix-pr-creation-so
fix(sales-order): allow payment request creation for so that are not billed
2019-12-03 10:42:53 +05:30
Rucha Mahabal
586fecfe73 fix: render_template for subject in Email Campaign (#19771) 2019-12-02 16:25:29 +05:30
sahil28297
14018b3dea bumped to version 12.2.2 2019-12-02 13:05:27 +05:30
Deepesh Garg
1c196f958f Merge pull request #19768 from deepeshgarg007/avaiable_stock_for_v12
fix: Available stock for packing item report
2019-12-02 11:57:45 +05:30
rohitwaghchaure
91f2cfb999 Merge pull request #19769 from rohitwaghchaure/sales_invoice_none_type_error_serial_no_validation
fix: Serial no validation against sales invoice
2019-12-02 09:46:23 +05:30
deepeshgarg007
c0a0331570 fix: Validation msg 2019-12-02 09:43:11 +05:30
deepeshgarg007
4ceba43e43 fix: Serial no validation against sales invoice 2019-12-02 09:43:04 +05:30
deepeshgarg007
9b64e2e24c fix: Available stock for packing item report 2019-12-01 22:20:18 +05:30
Deepesh Garg
da5e227ad6 fix: Post GL entry fix for asset (#19752) 2019-12-01 10:06:31 +05:30
Mangesh-Khairnar
4f95e5d092 fix: show create payment request for so that are not billed 2019-11-30 20:31:18 +05:30
Deepesh Garg
6a8fd0102f fix: Serial no validation against sales invoice (#19749)
* fix: Serial no validation against sales invoice

* fix: Validation msg
2019-11-29 18:48:30 +05:30
Suraj Shetty
2b172ec4b4 fix: valuation of "finished good" item in purchase receipt (#19745)
* fix: Remove redundant purchase orders and unwanted condition

* fix: [WIP] Purchase receipt value

* fix: Add raw material cost based on transfered raw material

* fix: get_qty_to_be_received

* fix: Remove debugger statement

* fix: Reset rm_supp_cost before setting subcontracted raw_materials

* test: Fix and modify tests for backflush_based_on_stock_entry

* fix: Add non stock items to Purchase Receipt from Purchase Order

* fix: Ignore valuation rate check for non stock raw material

* fix: Rename check all rows

* fix: Remove amount from test

* test: Fix item rate error

* fix: handling of serial nos in backflush

* fix: Add serial no. of raw materials

* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material

* fix: Raw material batch number selection in purchase receipt

* Update test_purchase_order.py
2019-11-29 16:59:21 +05:30
Marica
5d2ad7fc38 fix: UOM was not fetching in purchase invoice (#19732) (#19737)
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 20:00:51 +05:30
rohitwaghchaure
3347473aa1 fix: removed stock value and account balance out of sync validation (#19728) 2019-11-28 20:00:41 +05:30
Rohit Waghchaure
7f951b5595 fix: revert value out of sync feature 2019-11-28 20:00:33 +05:30
Marica
208c69f196 fix: Permission issue in Stock Entry (#19739) 2019-11-28 19:39:55 +05:30
Marica
32b69bf122 fix: UOM was not fetching in purchase invoice (#19732) (#19737)
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 19:03:14 +05:30
Marica
b1fac1817c fix: Validation for Suppliers in SO to PO (#19700)
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
2019-11-28 18:23:11 +05:30
Marica
6516358a71 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19704) 2019-11-28 18:20:53 +05:30
marination
c6e2087673 fix: Division by zero error in Stock Entry 2019-11-28 16:54:58 +05:30
Shivam Mishra
d8469a7bfa fix: handle None case for get_shipping_amount_from_rules (#19724) 2019-11-28 16:47:14 +05:30
Marica
cf645aceae chore: Added Quick Stock Balance to Stock Module (#19727)
- Also 'Stock Balance Report' button no longer primary button
2019-11-28 16:44:56 +05:30
rohitwaghchaure
3dd72e238f fix: removed stock value and account balance out of sync validation (#19728) 2019-11-28 16:44:05 +05:30
Deepesh Garg
b74ce74ec9 Merge pull request #19718 from deepeshgarg007/status_fix_v12
fix: Path for quotation expiry method in hooks
2019-11-28 12:24:20 +05:30
deepeshgarg007
074aaa6005 fix: Path for quotation expiry method in hooks 2019-11-28 10:31:11 +05:30
Marica
9d5f43f4f0 fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19694) 2019-11-27 15:50:45 +05:30
rohitwaghchaure
7522aadc6e Merge pull request #19697 from rohitwaghchaure/dont_stop_submitting_entry_due_to_mismatch_issue
fix: revert value out of sync feature
2019-11-27 12:32:04 +05:30
rohitwaghchaure
326fdcb454 Merge pull request #19687 from deepeshgarg007/sales_invoice_fix_develop
fix: Serial no validation against sales invoice
2019-11-27 11:36:10 +05:30
Rohit Waghchaure
c41addec96 fix: revert value out of sync feature 2019-11-27 08:49:08 +05:30
deepeshgarg007
defed15528 fix: Validation msg 2019-11-26 16:12:29 +05:30
deepeshgarg007
cbc29989fe fix: Serial no validation against sales invoice 2019-11-26 15:13:23 +05:30
Shivam Mishra
a791170f29 Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite
feat: Appointment Schedulling
2019-11-26 13:43:14 +05:30
rohitwaghchaure
b5991e9264 Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12
fix: BOM UX
2019-11-26 13:15:40 +05:30
0Pranav
fb1e87710b Tweaks to success redirect
- 5 seconds wait before redirect
- Edited description for URL in settings
2019-11-26 12:14:41 +05:30
0Pranav
8d2b0d800c Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-26 10:55:53 +05:30
0Pranav
2515022377 add condition for zero appointment slots 2019-11-26 10:55:28 +05:30
Deepesh Garg
5558ee8597 Merge pull request #19591 from 0Pranav/FR-ISS-152101
fix: add status "expired" to doctype quotation
2019-11-26 09:08:30 +05:30
Deepesh Garg
31a4fa5dd3 Merge pull request #19606 from deepeshgarg007/shareholder_refactor
refactor: Share Transfer code cleanup and refactor
2019-11-26 07:54:57 +05:30
deepeshgarg007
53a66ee386 fix: Method name in hooks, test case code clean up 2019-11-25 21:58:15 +05:30
rohitwaghchaure
0881557c7d Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue
fix: e-invoice issue
2019-11-25 19:24:23 +05:30
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +05:30
Nabin Hait
ecc6b1917b Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-25 18:13:58 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Pranav Nachnekar
fc5d8fcd9f Merge branch 'develop' into scheduling-ui-rewrite 2019-11-25 12:24:32 +00:00
0Pranav
b84e56ebb5 fix:travis tests 2019-11-25 17:32:02 +05:30
0Pranav
565d3efcdf fetch updated document in test_quotation 2019-11-25 17:11:12 +05:30
Pranav Nachnekar
d63ad3bb5f fix: add email group and newsletter links to CRM module view (#19679)
* fix: add email group and newsletter links to CRM module view

* chore: move email group to bottom
2019-11-25 16:50:47 +05:30
0Pranav
f9dec5201f fix:tests 2019-11-25 16:42:07 +05:30
0Pranav
cf3a2f6579 set transaction date to yesterday 2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b don't submit quotation 2019-11-25 15:15:00 +05:30
Nabin Hait
e0912e4fcc Merge branch 'v12-pre-release' into version-12 2019-11-25 15:11:24 +05:30
Nabin Hait
4d12f8acab bumped to version 12.2.0 2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9 log: Change log for v12.2.0 2019-11-25 15:08:47 +05:30
0Pranav
754c43f6c3 fix set_expired_status method 2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282 fix valid date 2019-11-25 14:14:51 +05:30
0Pranav
3ec5eabaf6 formatting 2019-11-25 14:11:31 +05:30
0Pranav
f2752bf38c fix: tests for python2 2019-11-25 14:09:49 +05:30
Nabin Hait
35e8d1e1d7 Stock acc bal sync msg (#19676)
* 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

* fix: make journal entry to sync stock and account balance

* fix: translated action label
2019-11-25 14:02:51 +05:30
0Pranav
a9ff7df2e6 add sql query to set valid_till 2019-11-25 12:55:27 +05:30
Nabin Hait
2fd6814cbf Merge branch 'marination-account_stock_sync_error' into develop 2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4 fix: make journal entry to sync stock and account balance 2019-11-25 12:33:40 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671)
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Pranav Nachnekar
04e3a506e4 fix: Primary address not being fetched for customer (#19667)
* fix: priamry address not being fetched

* add doctype to filter for customer_primary_address

* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
0Pranav
a077795581 fix tests 2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4 call commit after sql query for schedular job 2019-11-25 10:51:27 +05:30
Saqib
c9203a1bee fix: asset movement ux fixes (#19637) 2019-11-22 16:35:15 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:34 +05:30
Nabin Hait
aff4a67954 Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error 2019-11-22 15:14:32 +05:30
Marica
b5c296da9e fix: Validation Error message on Prepared Report. (#19639)
Give the user the reason why he has to use filters.
2019-11-22 14:38:58 +05:30
Marica
7ca472780b fix: Get Current Stock button not working in Purchase Receipt (#19645)
- Field visible in grid view as well for better feedback
2019-11-22 14:37:38 +05:30
Anurag Mishra
763660b2e4 fix: set allocated amount in employee advance as per total amount (#19626) 2019-11-22 13:32:25 +05:30
0Pranav
6c368e2dfb submit quotation in test 2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1 Fix sql query in set_expired_status 2019-11-22 12:38:43 +05:30
Mangesh-Khairnar
b10526dd86 fix: consider taxes in the grand total (#19631) 2019-11-22 12:28:33 +05:30
thefalconx33
fa42999314 fix: last purchase rate greater than selling price 2019-11-22 12:15:41 +05:30
Saqib
290253fdd0 fix: last purchase rate greater than selling price (#19617) 2019-11-22 12:12:29 +05:30
Deepesh Garg
24cde55e28 fix: Patch for updating price or product discount field (#19642)
* fix: Patch for updating price or product discount field

* fix: Update pactch

* Update update_price_or_product_discount.py
2019-11-22 11:57:42 +05:30
Ben Knowles
49cd19d917 fix: update syntax error in company.js (#19661) 2019-11-22 11:36:02 +05:30
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
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
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
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
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
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
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
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30
Mangesh-Khairnar
f69b9a8c47 fix: fetch default pos profile user for the company 2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed Add status expired to doctype quotation 2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
Anurag Mishra
28a7ce9a50 fix: On Specific case if no item code in name 2019-11-15 14:01:07 +05:30
0Pranav
18fda5a571 add appointment list to module page 2019-11-15 11:58:21 +05:30
rohitwaghchaure
16f6ca12a7 Merge pull request #19023 from Alchez/dev-work-order-bugs
fix: Work Order operating cost re-calculation on client-side (develop)
2019-11-15 11:19:10 +05:30
rohitwaghchaure
c74c5d5644 Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no
fix: stock reconciliation showing incorrect current serial no and qty
2019-11-15 10:17:11 +05:30
deepeshgarg007
57bd1308eb fix: Validation messages code cleanup 2019-11-15 08:25:48 +05:30
Deepesh Garg
0a23e1aea5 Merge pull request #19586 from prssanna/dashboard-fix
fix: Ignore Period Closing Voucher entries in Accounts dashboard
2019-11-15 08:21:02 +05:30
prssanna
74bbcb539f fix: Ignore period closing voucher entries in accounts dashboard 2019-11-14 22:47:58 +05:30
Mangesh-Khairnar
f1e6387fab Merge pull request #19585 from frappe/leave-approver-employee-fix
fix: fetch approver from employee
2019-11-14 19:28:22 +05:30
Mangesh-Khairnar
d545f6fb6b fix: fetch approver from employee 2019-11-14 19:26:49 +05:30
Rohit Waghchaure
cf55c9c6da fix: stock reconciliation shwoing incorrect current serial no and qty 2019-11-14 18:22:20 +05:30
Marica
c9e8a1bf96 fix: Account Balance and Stock Value out of sync error message (#19526)
* fix: Account Balance and Stock Value out of sync error message

Added 'Make Adjustment Entry' button and enhanced message

* fix: Split message and changed routing for translation
2019-11-14 16:13:43 +05:30
rohitwaghchaure
e942f99897 Update work_order.js 2019-11-14 15:26:18 +05:30
Nabin Hait
ec082754b4 fix: One serial no can be tagged in multiple invoices if used against different items (#19580) 2019-11-14 13:28:24 +05:30
Deepesh Garg
d69d0e3046 fix(patch): skip leave ledger entry creation for denied leaves (#19579) 2019-11-14 13:05:13 +05:30
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +05:30
Mangesh-Khairnar
fc3b924d4d fix: skip leave ledger entry creation for denied leaves (#19556)
* fix: skip leave ledger entry creation for denied leave application

* patch: remove incorrect leave ledger entries

* fix: create reverse ledger entry before setting status to cancel
2019-11-14 12:02:10 +05:30
0Pranav
793ba8fc06 pretty timezone names 2019-11-14 11:25:49 +05:30
Himanshu
5503b6cff5 fix(Task): Do not create/schedule task after project end (#19184)
* fix: do not create/schedule task after project end

* fix: check difference between dates

* fix: check project date

* fix: task creation

* fix: tests
2019-11-14 10:11:25 +05:30
Saqib
73616d6b33 fix: duplication while bulk creation of item tax template (#19570) 2019-11-14 10:09:44 +05:30
Deepesh Garg
95a6320459 Merge pull request #19576 from marination/cwip-patch-fix
fix(patch): Enable CWIP Accounting
2019-11-13 22:18:12 +05:30
Himanshu
1ad2d4a962 fix: get tags for rfq (#19564)
* fix: get tags for rfq

* chore: remove console log
2019-11-13 19:21:52 +05:30
marination
9ffa9d4a64 fix(patch): Enable CWIP Accounting 2019-11-13 19:10:20 +05:30
Mangesh-Khairnar
af7fe1937e fix: fetch leave approver defined in employee in leave application (#19559)
* fix: fetch leave approver defined in employee in leave application

* Update department_approver.py
2019-11-13 19:00:56 +05:30
Saqib
3e515e704d Monthly distribution of depreciation amount (#19493)
* feat: allow monthly distribution of depreciation amount

* chore: added comments

* fix: monthly depr was not starting from use date's month
2019-11-13 19:00:24 +05:30
rohitwaghchaure
94565d69d1 fix: travis failing (#19568) 2019-11-13 18:58:22 +05:30
Nabin Hait
732d6afad5 fix: Show AR summary based on outstanding (#19573) 2019-11-13 18:49:23 +05:30
rohitwaghchaure
d064505ebe fix: incorrect produced qty in the production plan (#19569) 2019-11-13 18:17:48 +05:30
rohitwaghchaure
ba8fc21594 fix: merge similar entries for serialized items in stock reconciliation (#19408) 2019-11-13 18:11:58 +05:30
Nabin Hait
3a72cb46bc fix: Set due date in accounts receivable based on payment terms (#19563) 2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3 Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
0Pranav
4006eb5277 Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-13 17:12:24 +05:30
Pranav Nachnekar
ccd9b38463 Merge branch 'develop' into scheduling-ui-rewrite 2019-11-13 11:41:41 +00:00
0Pranav
c31808f5b2 fix margins 2019-11-13 16:47:51 +05:30
0Pranav
6e6954cab8 timezone aware datetime 2019-11-13 16:00:59 +05:30
0Pranav
b1e9fb9e14 fix: buttons on page of appointment scheduling 2019-11-13 15:32:56 +05:30
0Pranav
67f191df4e padding fixes for timeslot divs 2019-11-13 14:14:10 +05:30
deepeshgarg007
5ea4328359 fix: Accumulated Values filter disappearing 2019-11-13 13:23:49 +05:30
Rohan
4d27b50437 Merge branch 'develop' into dev-work-order-bugs 2019-11-13 13:09:12 +05:30
0Pranav
c72e1f812d adjust padding for appointment booking 2019-11-13 12:59:05 +05:30
0Pranav
a92f060740 multiple fixes in index.js 2019-11-13 12:13:42 +05:30
0Pranav
f25e2a29f7 fix:formatting 2019-11-13 12:01:36 +05:30
0Pranav
cce000a6d0 remove: commented code 2019-11-13 11:48:37 +05:30
0Pranav
db64c69dac fix: reference before assignement error 2019-11-13 11:12:38 +05:30
0Pranav
f75ea952e3 Added expired status to quotation 2019-11-13 11:03:53 +05:30
rohitwaghchaure
ffbfaf7099 fix: email digest showing incorrect upcoming events (#19552) 2019-11-13 10:59:23 +05:30
Mangesh-Khairnar
06c8129574 fix(batch): fetch company on splitting the batch (#19558) 2019-11-13 10:51:43 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262)
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
rohitwaghchaure
010714757c fix: '<' not supported between instances of 'str' and 'NoneType' (#19553) 2019-11-12 18:20:07 +05:30
MorezMartin
4fa6194009 feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order (#19541)
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items

* Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan

* sync with fork

* Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* rewied and add item_details.description in case of blank field
2019-11-12 18:19:01 +05:30
Marica
29a2e16f62 fix: Add Serial No. button not responding (#19550) 2019-11-12 14:43:41 +05:30
Deepesh Garg
3cc3b57926 fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry (#19427)
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry

* fix: Codacy

* fix: Minor UX fixes

* fix: Also credit payable amount in case of advance payment

* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
deepeshgarg007
929676fceb fix: Validation logic code cleanup 2019-11-12 12:00:30 +05:30
Deepesh Garg
2689acfc8e Merge pull request #19549 from DeeMysterio/v12-emp-err
fix(employee): show only active employees in the error display while …
2019-11-11 21:50:07 +05:30
Diksha
39152f935c fix(employee): show only active employees in the error display while marking a reporting to employee as left 2019-11-11 19:22:51 +05:30
rohitwaghchaure
001ee5ee1b fix: dictionary changed size during iteration (#19546) 2019-11-11 17:43:48 +05:30
Mitchy25
a227b9a9a6 Fix Bank Reconcilaition for Payment Entries (#19190)
* Fix Bank Reconciliation with Payment Entries

* Update bank_reconciliation.js
2019-11-11 17:29:53 +05:30
ci2014
8b2223ae5f Move add_custom_button for Gantt and Kanban Board (#19193)
Move add_custom_button for Gantt and Kanban Board to set_buttons, because in onload it is not working.
2019-11-11 17:27:48 +05:30
Nabin Hait
f997b443e1 Merge branch 'finbyz-develop' into develop 2019-11-11 17:20:28 +05:30
Nabin Hait
4c7ac65db1 fix: Made Campaign for field mandatory 2019-11-11 17:19:52 +05:30
FinByz Tech Pvt. Ltd
88de00fb94 Rendered Email template in email Campaign 2019-11-11 17:17:21 +05:30
Tufan Kaynak
06c6f7cfd3 fix: Currency Exchange for_selling and for_buying on the same day (#19339)
* fix: test data of Currency Exchange to incluse buying and selling

test data of Currency Exchange to incluse buying and selling

* fix: Currency Exchange Test corrected to include selling and buying exchange_rate

Currency Exchange Test corrected to include selling and buying exchange_rate

* fix: Currency Exchange for_selling and for_buying fields test and functionality restored


In this fix:
* You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date
* tests did not account for for_selling and for_buying fields and thier uniqueness

* Update test_currency_exchange.py

* Update test_records.json

* fix: update test_records.json

* Update test_records.json

* The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package.

* fix: update code with scapes vs.tabs

updated the code regarding spaces issue

* Update currency_exchange.py
2019-11-11 17:11:16 +05:30
Saurabh
d3ed499854 Merge pull request #19416 from EconCode/shopify-connector-unregisterfix
fix: unregistering url wrong formatted string
2019-11-11 17:04:44 +05:30
Nabin Hait
32936024a0 patch: set default for add taxes from item tax template 2019-11-11 15:44:27 +05:30
Nabin Hait
8bd2d4d35e fix(trial balance): Show opening and closing of group account in single column (#19509) 2019-11-11 10:59:20 +05:30
rohitwaghchaure
df75b7693a fix: added description, uom fields in material request plan item table (#19463) 2019-11-11 10:59:10 +05:30
Mangesh-Khairnar
2f44480d69 enhancement: Item-wise sales history report (#19500)
* refactor(item-wise-sales-history): convert query report to script report

* refactor: add columns, fetch data

* refactor: shift company set func to utils

* fix: add filters

* fix: minor changes

* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
rohitwaghchaure
090f9a3dc9 Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate
fix: precision issue
2019-11-08 14:54:58 +05:30
rohitwaghchaure
b81942404d fix: incorrect balance qty in stock ledger if batch filter set (#19479) 2019-11-08 14:50:48 +05:30
rohitwaghchaure
d36c6068b2 fix: 'NoneType' object has no attribute 'stock_uom' (#19532) 2019-11-08 14:43:53 +05:30
Rohit Waghchaure
e93dc9f1cd fix: precision issue 2019-11-08 13:43:15 +05:30
Deepesh Garg
7a23057eab feat: Enhancement in landed cost voucher (#19252)
* feat: Enhancement in landed cost voucher

* fix: Make GL entries based on ledgers in Landed cost voucher

* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry

* fix: Ability to select expense account in Stock Entry

* fix: Renaming and test case fixes

* fix: Test Cases

* fix: Additional cost in Stock Entry

* fix: Changed filters and test case fixes

* fix: Upadte filters in stokc entry expense account filter

* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43 fix: Accounting Dimension custom fields should be admin owned (#19525)
* fix: Accounting Dimension custom fileds should be admin owned

* fix: Update query

* fix: Travis
2019-11-08 12:42:38 +05:30
Deepesh Garg
a839510b33 Merge pull request #19528 from deepeshgarg007/gst_check_digit_msg
fix: GSTIN validation msg fix
2019-11-07 23:05:23 +05:30
deepeshgarg007
62fbf37eb4 fix: GSTIN validation msg fix 2019-11-07 21:54:25 +05:30
Deepesh Garg
4a6c723310 Merge pull request #19527 from deepeshgarg007/gstr_1_error_fix
fix: Exception handling in GSTR-1 Report
2019-11-07 20:19:29 +05:30
deepeshgarg007
015285c42f fix: Exception handling in GSTR-1 Report 2019-11-07 19:38:52 +05:30
Rucha Mahabal
b455318f01 fix(Integration): Woocommerce issues (#19487)
* fix: Delivery URL returned response code 500

* fix: set default company in Woocommerce Settings

* fix: remove redundant function calls

* fix: make offset configurable for delivery date in sales order

* fix: remove redundant code from woocommerce_settings.py

* fix: import create_custom_field

* fix: added ignore_mandatory for saving item, customer and sales order

* fix: remove unused woocommerce_check custom field

* fix: do not delete custom fields or item group when sync is disabled
2019-11-07 18:20:32 +05:30
Nabin Hait
628701f1a5 fix: Accounts mandatory depending on share transfer type (#19523) 2019-11-07 18:05:40 +05:30
Himanshu
bac50bc295 fix: remove validate for issue priority (#19522) 2019-11-07 18:04:50 +05:30
Saurabh
28c6a0aeb1 fix: reload global defaults (#19517) 2019-11-07 14:16:26 +05:30
0Pranav
83100c9c84 Add comemnts for tz conversions 2019-11-07 13:37:11 +05:30
0Pranav
0671ea8137 use frappe.Redirect instead of DoesNotExistError 2019-11-07 13:31:56 +05:30
0Pranav
76b20a5fa4 crack some one liners 2019-11-07 13:24:59 +05:30
rohitwaghchaure
15382a6f71 Merge pull request #19518 from sahil28297/fix_cart
fix(cart): return rule instead of rule_label_map
2019-11-07 13:03:41 +05:30
Marica
52d888de42 fix[minor]: Payment Entry status patch (#19519) 2019-11-07 13:01:45 +05:30
0Pranav
151853b887 remove unneccessary imports 2019-11-07 12:55:43 +05:30
0Pranav
51208b3f0b fix:formatting 2019-11-07 12:54:48 +05:30
Marica
e37a67245e fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388) 2019-11-07 12:52:23 +05:30
0Pranav
75db6f7073 convert indentation to tabs 2019-11-07 12:47:00 +05:30
Sahil Khan
1c44bb0982 fix(cart): return rule instead of rule_label_map 2019-11-07 12:38:05 +05:30
0Pranav
fce8f36bb2 don't change lead if assigned 2019-11-07 12:37:28 +05:30
theopen-institute
36520ef951 fix: Add a setting to make creation of new Student User optional (#19122)
* New setting to skip Student User creation

* Allow skip of new User creation via settings
2019-11-06 19:09:15 +05:30
Raffael Meyer
edba06038e feat(regional): enable transaction log for germany (#19198) 2019-11-06 19:07:04 +05:30
Mitchy25
a5776d16b4 fix: Version 12 Bank Reconciliation fix (#19182)
* Fix Bank Reconciliation

Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters

* Update bank_reconciliation.js

Removing incorrect fix to filters.

Filters are loaded from Bank Transaction List.

* Update bank_reconciliation.js
2019-11-06 19:04:54 +05:30
Suraj Shetty
7508896bfb perf: Optimise BOM Update Tool (#19236)
* perf: Optimize BOM update tool
- Remove redundant traverse_tree calls
- Cache bom_children data

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replace get_list with db.sql

* fix: Enable versioning for updated BOM

* fix: Directly save doc_before_save from bom obj instead of using  load_doc_before_save

* fix: recurssion check performance issue
2019-11-06 18:46:57 +05:30
Mangesh-Khairnar
a709ae894c feat: duplicate linked task in project (#19271)
* feat: create a duplicate project

* fix: allow duplication via form

* feat: fetch old task and link project

* fix: link task with project

* fix: parse json string as python object

* fix: avoid duplicate task based on the project template

* fix: ask user for the new project name

* fix: display a descriptive message on switching to a new route

* fix: override duplicate in menu

* fix: check for duplicate project name after submitting prompt

* fix: set the project template

* fix: minor changes

* fix: function call

* refactor: add a separate button for duplicate

* Update project.js
2019-11-06 18:20:06 +05:30
Deepesh Garg
02b9472152 Merge pull request #19490 from prssanna/dashboard-fix
fix: fix dashboard with date range
2019-11-06 18:17:08 +05:30
Marica
1beed7db72 fix: Added 'status' field in Payment Entry (#19507) 2019-11-06 18:12:29 +05:30
Shivam Mishra
d743583bf4 fix: contact creation and fetching for shopping cart (#19510) 2019-11-06 18:03:03 +05:30
rohitwaghchaure
0c12eded05 Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report
fix: unknown column credit limit in accounts receivable report
2019-11-06 17:26:35 +05:30
Deepesh Garg
f67833f249 Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-06 16:40:04 +05:30
rohitwaghchaure
6a50c92087 Update accounts_receivable.js 2019-11-06 16:34:17 +05:30
rohitwaghchaure
e123ec6b45 fix: incorrect number of entries while making deferred revenue entry (#19473) 2019-11-06 15:25:00 +05:30
Saqib
01c19d3b93 internal issues (#19496)
* fix: user remark mandatory in quick entry but not in form

* fix: preview salary slip btn showing in draft and unsaved states

* minor: removed unecessay comma

* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Rohit Waghchaure
dec5bead9c fix: unknown column credit limit in accounts receivable report 2019-11-06 13:13:31 +05:30
0Pranav
6f1d2eeffd changes to suggestions made by shivam 2019-11-06 11:57:37 +05:30
Rohan
f527713b89 Merge branch 'develop' into dev-work-order-bugs 2019-11-06 11:39:24 +05:30
rohitwaghchaure
57f2dce682 Merge pull request #19502 from rohitwaghchaure/removed_in_flag_test_while_creating_default_account
fix: code cleanup
2019-11-05 14:56:01 +05:30
0Pranav
d1ee962d4b seperate function for sending confirmation 2019-11-05 14:53:36 +05:30
Rohit Waghchaure
730c8a145d minor: code cleanup 2019-11-05 12:46:52 +05:30
Pranav Nachnekar
4d3dc87a1a Apply suggestions from code review
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-11-05 04:32:06 +00:00
Prssanna Desai
167aa7655d Merge branch 'develop' into dashboard-fix 2019-11-04 15:42:20 +05:30
Gavin D'souza
05710804cf fix: invoice creation tool of invoices with no paid and outstanding amounts 2019-11-04 14:45:11 +05:30
Deepesh Garg
50b6976c67 Merge pull request #19488 from DeeMysterio/dev-delivery-dn
fix(sales order): rename delivery to delivery note on sales order mak…
2019-11-04 13:17:12 +05:30
prssanna
7e2b030052 fix: fix dashboard with date range 2019-11-04 13:07:27 +05:30
Diksha
7091a2102c fix(sales order): rename delivery to delivery note on sales order make button 2019-11-04 12:03:35 +05:30
Pranav Nachnekar
af18b2cdc5 Merge branch 'develop' into scheduling-ui-rewrite 2019-11-04 04:38:59 +00:00
Deepesh Garg
b565e9ba64 Merge pull request #19309 from sagargharge/develop
fix: restricted duplicate guardians on student doctype (#19194)
2019-11-04 09:04:29 +05:30
Mangesh-Khairnar
e3bc213262 feat: multiple company pos profile 2019-11-01 22:35:08 +05:30
rohitwaghchaure
475d8e3cdc Merge pull request #19477 from rohitwaghchaure/production_plan_warehouse_not_changed
fix: Wrong warehouse fetched in production plan
2019-11-01 16:46:46 +05:30
Deepesh Garg
0bcf8b64f6 Merge pull request #19422 from marination/search-field
fix: Search field entries included in Item Link field query
2019-11-01 15:38:25 +05:30
Rohit Waghchaure
1bb5d01192 fix: Wrong warehouse fetched in production plan 2019-11-01 14:24:21 +05:30
Deepesh Garg
ebf46120ba Merge pull request #18985 from Alchez/dev-serial-no-statuses
feat: add statuses for Serial No
2019-11-01 14:16:45 +05:30
0Pranav
e573bd9074 remove unnecessary variable 2019-11-01 12:47:11 +05:30
0Pranav
53ec8c6322 Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-01 12:40:08 +05:30
deepeshgarg007
c82aed0718 fix: Add missing semicolon 2019-11-01 12:36:33 +05:30
0Pranav
97f6576213 prettify confirmation email 2019-11-01 12:36:06 +05:30
0Pranav
54f33f4e5d move utility functions 2019-11-01 12:14:21 +05:30
0Pranav
3609872760 rename function 2019-11-01 12:06:42 +05:30
Deepesh Garg
9378aacbe5 Merge pull request #17151 from Alchez/develop-company-address-label
fix(selling): Add missing label to company address field
2019-11-01 11:56:08 +05:30
0Pranav
6de68c8671 avoid repetition on get_form date 2019-11-01 09:51:32 +05:30
0Pranav
957c9f5ff0 fix:comments 2019-11-01 09:36:45 +05:30
0Pranav
4701bc8bfc Add ignore permissions for opportunity 2019-11-01 09:36:29 +05:30
Deepesh Garg
3cbd70a1d9 Merge pull request #19316 from joelios/develop
fix: Unable to create timesheet from project dashboard
2019-10-31 23:28:13 +05:30
Deepesh Garg
2ec7acb592 Merge pull request #19294 from vijaywm/duplicate-attendance
fix: Typo in attendance date filter
2019-10-31 16:46:52 +05:30
Ashish Shah
28710cdf99 fix: coupon code changes suggested by prasad (#19352)
* changes suggested by prasad

* codacy correction
2019-10-31 16:09:06 +05:30
Mangesh-Khairnar
45c18b3184 fix: fetch employee department (#19433) 2019-10-31 16:00:52 +05:30
Suraj Shetty
519ca54f53 feat: Show timesheets related to customer's projects on customer portal (#19443)
* fix: Show timesheets related to customer's projects on customer portal

* style: fix codacy
2019-10-31 16:00:04 +05:30
Suraj Shetty
77e4cf89f8 fix: Pass parent_acc_name (#19450) 2019-10-31 15:57:31 +05:30
deepeshgarg007
4a1d000c33 fix: Test Case 2019-10-31 15:57:15 +05:30
rohitwaghchaure
81c217584a fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466) 2019-10-31 15:56:10 +05:30
Anurag Mishra
a11e738801 feat: Stock value and account balance sync. (#19233)
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked

* fix(test): Sales Invoice

* fix(test): Purchase Invoice

* fix(test): Delivery Note

* fix: more test_case

* fix(test): Stock Entry

* fix(test): Purchase Receipt

* fix(more-test): Stock Entries

* fix(more-test): Sales Invoice and Delivery Note

* fix: tests for delivery note

* fix: tests for stock reconciliation

* refactor: stock and account balance function

* fix(more-test): Warehouse

* fix(test): Landed Cost Voucher

* fix: changes requested
2019-10-31 15:55:03 +05:30
0Pranav
e494144c96 merge settings fetch, add helpers 2019-10-31 15:38:39 +05:30
0Pranav
60093d98b0 auto assign before creating event 2019-10-31 15:37:57 +05:30
0Pranav
d1c530c564 fix: merge settings into one call 2019-10-31 15:36:33 +05:30
gavin
7e9b90ad06 Merge pull request #19448 from gavindsouza/hooks-update
chore: moves email digest to long job from regular
2019-10-31 14:35:14 +05:30
gavin
450da16dc2 Merge branch 'develop' into hooks-update 2019-10-31 11:26:37 +05:30
rohitwaghchaure
139c20a736 Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12
fix: item price stock report not working
2019-10-30 22:30:10 +05:30
marination
1e754b161c fix: Fetching catched meta and removed description fetch from Search Fields
Description is conditionally fetched and also used in WHERE clause, that is maintained.
Improved naming
2019-10-30 18:33:44 +05:30
gavin
8ed6772727 Merge branch 'develop' into hooks-update 2019-10-30 17:52:36 +05:30
gavin
ad04d442a1 Merge pull request #19442 from 0Pranav/maintainance-ux-fix
fix: maintenance schedule ux
2019-10-30 17:51:55 +05:30
rohitwaghchaure
99c8245512 Merge pull request #19456 from frappe/revert-19432-showing_untitled_name_in_item_tax_template
Revert "fix: patch, item tax template showing 'Untitled' in the name"
2019-10-30 17:38:02 +05:30
rohitwaghchaure
6bd6039496 Revert "fix: patch, item tax template showing 'Untitled' in the name" 2019-10-30 17:37:22 +05:30
Pranav Nachnekar
c02cb6ca94 Merge branch 'develop' into maintainance-ux-fix 2019-10-30 11:15:44 +00:00
rohitwaghchaure
1545ee914a Merge pull request #19432 from rohitwaghchaure/showing_untitled_name_in_item_tax_template
fix: patch, item tax template showing 'Untitled' in the name
2019-10-30 16:33:56 +05:30
rohitwaghchaure
7b6ab9738d Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order
fix: not able to select the project in the work order
2019-10-30 16:32:34 +05:30
Rohit Waghchaure
d8b64cd199 replaced frappe.db.sql with frappe.get_all 2019-10-30 16:27:58 +05:30
Rohit Waghchaure
2e01573a40 fix: item price stock report not working 2019-10-30 16:22:30 +05:30
Deepesh Garg
fac4eb919b Merge pull request #19445 from scmmishra/typo-fix
fix: typo in production plan
2019-10-30 16:03:56 +05:30
gavin
e0348c9ec8 Merge branch 'develop' into hooks-update 2019-10-30 15:46:46 +05:30
Pranav Nachnekar
66e5e16a2e Merge branch 'develop' into maintainance-ux-fix 2019-10-30 09:54:47 +00:00
Gavin D'souza
d38f5374cb chore: moved email digest to long job 2019-10-30 14:43:58 +05:30
Mangesh-Khairnar
83c7b5b44b fix(bom): maintain a default bom for an item (#19407) 2019-10-30 14:25:50 +05:30
Mangesh-Khairnar
7638788c2f fix: calculate pending leaves (#19411) 2019-10-30 14:23:41 +05:30
Rohit Waghchaure
486a8f67a4 fix: not able to select the project in the work order 2019-10-30 14:22:49 +05:30
Anurag Mishra
5c9d92eabf fix: On Specific case if no item code in name (#19419) 2019-10-30 14:18:16 +05:30
Shivam Mishra
afa03fd654 Merge branch 'develop' into typo-fix 2019-10-30 14:08:20 +05:30
Shivam Mishra
d8abac3278 fix: typo in production plan 2019-10-30 14:06:56 +05:30
0Pranav
c8333d4b41 fix: codacy 2019-10-30 13:48:01 +05:30
0Pranav
07b74533fe fix: error message matches field name 2019-10-30 13:47:49 +05:30
Faris Ansari
e127d937f7 fix(ExpenseClaim): List filter config for Rejected and Unpaid (#19434) 2019-10-30 13:31:05 +05:30
0Pranav
da5bf5a7c4 fix:indentation 2019-10-30 11:24:58 +05:30
0Pranav
be5c6e7aec fix:readability 2019-10-30 11:14:49 +05:30
0Pranav
0f0d6ce25c Remove doctype related to appointment scheduling 2019-10-30 11:08:09 +05:30
Deepesh Garg
d0003408c4 Merge pull request #19438 from ahmadRagheb/patch-1
fix:  getdate get imported twice
2019-10-30 10:58:12 +05:30
0Pranav
846c03889e fix: hide schedule section on new forms 2019-10-30 10:51:25 +05:30
0Pranav
d2d0100c9a fix:better error message when sales person is none 2019-10-30 10:48:13 +05:30
0Pranav
abbc08cb48 fix: hide generate schedule button on new forms 2019-10-30 10:46:16 +05:30
ahmadRagheb
2a72d1fee4 Update salary_slip.py
getdate imported twice
2019-10-29 19:49:08 +02:00
Rohit Waghchaure
b051fa37df fix: patch, item tax template showing 'Untitled' in the name 2019-10-29 14:56:03 +05:30
Faris Ansari
bcf107b9f7 chore: fix unexpected keyword in shopify_settings (#19430)
chore: fix unexpected keyword in shopify_settings
2019-10-29 14:25:37 +05:30
Deepesh Garg
118f2c7d64 Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status
fix: sync delivery note status in both list view and form view
2019-10-29 14:17:38 +05:30
Chinmay D. Pai
702f9f929b chore: rename undefined variable in shopify_log
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:30:13 +05:30
Chinmay D. Pai
4f7885f1aa chore: fix unexpected keyword in shopify_settings
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:20:17 +05:30
rohitwaghchaure
3270ba6d8c Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
fix: 'NoneType' object is not iterable
2019-10-29 11:30:22 +05:30
Rohan
8728e94dbd Merge branch 'develop' into develop-company-address-label 2019-10-29 11:26:00 +05:30
Rohan
379f38e1cd Merge branch 'develop' into dev-work-order-bugs 2019-10-29 11:25:53 +05:30
Rohan
fba7cae2c9 Merge branch 'develop' into dev-serial-no-statuses 2019-10-29 11:25:36 +05:30
Rohit Waghchaure
88d2c97391 fix: default accounts are not added on creation of company 2019-10-28 17:50:31 +05:30
Anurag Mishra
07b908c0c5 patch: Missing Patch for item Tax template 2019-10-28 16:00:24 +05:30
marination
3dbef9de74 fix: Search field entries included in Item Link field query 2019-10-28 15:48:10 +05:30
Rohit Waghchaure
8916916a03 fix: 'NoneType' object is not iterable 2019-10-28 13:00:18 +05:30
Deepesh Garg
9942fcc8cb fix: Better validation msg for difference account in Stock Entry (#19400)
* fix: Better validation msg for difference account

* fix: Make primary info bold
2019-10-28 12:08:31 +05:30
Suraj Shetty
83b58352ce fix: Overwrite default cost center if item has default cost center set. (#19405) 2019-10-28 12:05:30 +05:30
Deepesh Garg
a8358f0342 Merge pull request #19415 from frappe/jaichavan-fix-typo
fix: typo in Budget Variance Report
2019-10-27 18:39:23 +05:30
Deepesh Garg
8e7bb002e2 Merge pull request #19317 from frappe/revert-19265-issue_fix
refactor: Remove ignore_disabled flag from issue doctype
2019-10-27 18:38:53 +05:30
Shivam Mishra
5e14660dda Merge branch 'develop' into revert-19265-issue_fix 2019-10-27 17:36:08 +05:30
Saurabh
53794a9029 Merge pull request #19417 from frappe/v12-pre-release
V12 pre release
2019-10-26 20:06:53 +05:30
Sahil Khan
0c0604b7ee Merge branch 'v12-pre-release' into version-12 2019-10-26 20:02:19 +05:30
Sahil Khan
e6f86c934d bumped to version 12.1.8 2019-10-26 20:22:19 +05:50
EconCode
07ae3abf34 fix: unregistering url wrong formated string
Fixed the formated string for unregistering webhooks.
String should look like:
"/admin/api/2019-04/webhooks/#{webhook_id}.json"

Taken from shopify api documentation - deleting webhooks:
https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04
2019-10-26 16:31:29 +02:00
Sahil Khan
970788c64e Merge branch 'v12-pre-release' of https://github.com/frappe/erpnext into v12-pre-release 2019-10-26 19:56:31 +05:30
Sahil Khan
ce5200d700 bumped to version 12.1.7 2019-10-26 19:56:06 +05:30
Jai Chavan
9f483c1fa9 fix: Spelling of Variance 2019-10-26 18:45:01 +05:30
Saurabh
213785e6d5 Merge pull request #19409 from surajshetty3416/accounting-module-fix
fix: Patch to replace accounting with accounts in home_settings
2019-10-26 11:14:25 +05:30
Suraj Shetty
8f67ef8a75 fix: Add patch to replace accounting with accounts in home_settings 2019-10-25 18:55:57 +05:30
Deepesh Garg
09a6868ccd Merge pull request #19390 from 0Pranav/patch-1
fix: setting incorrect field for party bank account
2019-10-25 12:24:39 +05:30
Ashish Shah
e1f95c0529 fix: allow_items_not_in_stock should be evaluated (#19398) 2019-10-25 12:16:11 +05:30
0Pranav
8c1b88f156 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-10-25 11:45:03 +05:30
Aditya Hase
7bdc612013 chore: Update module name (#19404) 2019-10-24 18:01:58 +05:30
Sahil Khan
6d9a300a85 Merge branch 'v12-pre-release' into version-12 2019-10-24 17:30:19 +05:30
Sahil Khan
758635ab91 bumped to version 12.1.7 2019-10-24 17:50:19 +05:50
Mangesh-Khairnar
233c0bc779 fix: sync delivery note status in both list view and form view 2019-10-24 15:46:12 +05:30
rohitwaghchaure
5d0362669d Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch
fix: not able to select the zero qty batch while making the sales ret…
2019-10-23 18:35:58 +05:30
rohitwaghchaure
1da236fdd2 Merge pull request #19322 from ashish-greycube/item_row_link_issue
Item row link issue
2019-10-23 18:06:36 +05:30
Rohan
962f4eb96c Merge branch 'develop' into develop-company-address-label 2019-10-23 15:57:26 +05:30
Pranav Nachnekar
d5166861de fix:setting incorrect field for party bank account
Previously
![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif)

Corrected
![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif)
2019-10-23 07:46:00 +00:00
Deepesh Garg
d9e27b727f Merge branch 'develop' into item_row_link_issue 2019-10-23 12:20:19 +05:30
Deepesh Garg
275f3f8b91 Merge pull request #19320 from deepeshgarg007/demo-fixes
fix: Demo Script fixes
2019-10-23 12:17:08 +05:30
Deepesh Garg
3f96306986 Merge pull request #19375 from khushalti/develop
fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order
2019-10-23 12:11:13 +05:30
rohitwaghchaure
5ff377e2bb fix: product link not working in website (#19373) 2019-10-23 11:09:21 +05:30
deepeshgarg007
799f8d4f93 Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes 2019-10-23 08:47:11 +05:30
Deepesh Garg
36c97c3128 Merge pull request #19385 from ruchamahabal/fix_moduleview
fix: custom doctypes and reports not visible in Accounts module view
2019-10-22 17:34:38 +05:30
Deepesh Garg
453ad3c155 Merge branch 'develop' into develop 2019-10-22 17:30:13 +05:30
Shivam Mishra
85c028b60d Merge branch 'develop' into revert-19265-issue_fix 2019-10-22 17:26:54 +05:30
Rohan
ee5f0f7c30 Merge branch 'develop' into dev-work-order-bugs 2019-10-22 17:12:00 +05:30
Rohan
8522fdc99c Merge branch 'develop' into dev-serial-no-statuses 2019-10-22 17:11:30 +05:30
gavin
2f63529029 Merge pull request #19384 from gavindsouza/docs-templates
chore(docs): added issue, PR templates, updated SECURITY policy
2019-10-22 15:30:40 +05:30
gavin
e89d4e2b7f Merge branch 'develop' into docs-templates 2019-10-22 15:16:02 +05:30
Nabin Hait
bd6b1806cd fix: fixed asset register report and made skip-dn field hidden 2019-10-22 14:28:37 +05:30
Rohit Waghchaure
d8ddd1e2ec fix: not able to select the zero qty batch while making the sales return entry 2019-10-22 14:05:13 +05:30
Rucha Mahabal
b5bd3f3abf fix: custom doctypes and reports not visible in Accounts module view 2019-10-22 13:38:36 +05:30
Gavin D'souza
ce77c4ac4c fix(docs): link update frappe => erpnext 2019-10-22 13:20:02 +05:30
Gavin D'souza
22bc0a929b chore(docs): Added contribution templates, SECURITY policy 2019-10-22 13:14:57 +05:30
Nabin Hait
bebbc6371b fix: Validation message in work order 2019-10-22 12:35:28 +05:30
0Pranav
d583e412c9 Add generic 'Appointment' doctype 2019-10-22 12:33:09 +05:30
Saurabh
bdc899857c Fix: Shopify payload operations logging (#19366)
* fix: payload logging for shopify

* fix: remove print statements
2019-10-22 12:31:56 +05:30
Anurag Mishra
b7e9e2a1a5 fix: if naming if item-code and index both are same (#19371) 2019-10-22 11:47:03 +05:30
Anurag Mishra
eaff541349 fix: query (#19376) 2019-10-22 11:46:17 +05:30
Deepesh Garg
a324be86d2 Merge branch 'develop' into develop 2019-10-21 21:23:23 +05:30
Khushal Trivedi
e22ca23b81 fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order 2019-10-21 18:17:42 +05:30
gavin
ed8e3b3786 fix: link field country in shopping cart (#19370) 2019-10-21 18:12:29 +05:30
Khushal Trivedi
974f04be24 Merge branch 'develop' of https://github.com/khushalti/erpnext into develop 2019-10-21 17:57:45 +05:30
Khushal Trivedi
ad71307a5e fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order 2019-10-21 17:46:35 +05:30
Khushal Trivedi
ce5c2d8682 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-10-21 17:36:19 +05:30
Khushal Trivedi
cdebd400ec [Fix] - changed codacy changers suggested 2019-10-21 16:29:16 +05:30
Saurabh
48eff90d1f fix: Don't show make jv button if equity or liability account and asset account not specified (#19350) 2019-10-21 16:03:28 +05:30
Deepesh Garg
c58d7d8a98 Merge pull request #19363 from rohitwaghchaure/stock_balance_report_not_working_for_stock_recon
fix: stock balance report not working if actual qty is zero
2019-10-21 15:52:40 +05:30
Deepesh Garg
fbae893f07 Merge pull request #19306 from nabinhait/required_date_fix
fix: Always set required date based on min date on item table
2019-10-21 15:25:23 +05:30
Rohit Waghchaure
432b03572a fix: stock balance report not working if actual qty is zero 2019-10-21 13:42:54 +05:30
Abdulla P I
4f4e490d53 fix(HR):adding is_compensatory as default in setup (#19307) 2019-10-21 13:42:17 +05:30
Nabin Hait
dfc10bb5ae fix: Fixed consumed qty based on Stock Ledger Entry (#19305)
* fix: Fixed consumed qty based on Stock Ledger Entry

* Update itemwise_recommended_reorder_level.py
2019-10-21 13:41:42 +05:30
Nabin Hait
dd893254be Update buying_controller.py 2019-10-21 13:40:00 +05:30
Nabin Hait
f2d37a7280 fix: Removed inter-company account filter for inter-company journal entry (#19308) 2019-10-21 13:36:47 +05:30
Nabin Hait
8232bd01d6 fix: Positive qty in sales return print (#19310) 2019-10-21 13:36:26 +05:30
Nabin Hait
49a46f08de fix: Set gross profit in SO item on updating rate after submission (#19311) 2019-10-21 13:35:43 +05:30
Frappe PR Bot
75c5c89909 feat: Updated translation (#19329) 2019-10-21 13:34:14 +05:30
Mangesh-Khairnar
cdf15222e1 fix: half day leave (#19323) 2019-10-21 13:33:46 +05:30
Deepesh Garg
6208755d54 fix: Unable to add details in quotation and opportunity (#19354) 2019-10-21 13:29:44 +05:30
Deepesh Garg
4821f38d25 fix: Item Price changes are not persistent after updating cost on submitted BOM (#19356) 2019-10-21 13:27:40 +05:30
rohitwaghchaure
717ad388be Merge pull request #19319 from deepeshgarg007/asset-fixes-1
fix: Value after depreciation fixes in asset
2019-10-21 12:16:16 +05:30
Deepesh Garg
dc694597f0 Merge branch 'develop' into develop 2019-10-20 22:04:30 +05:30
Deepesh Garg
9474b90fda Merge pull request #19360 from mudux/develop
fix: vitals chart legibility and BMI annotation
2019-10-20 21:56:38 +05:30
Deepesh Garg
721c381df3 Merge branch 'develop' into develop 2019-10-20 18:15:58 +05:30
Deepesh Garg
305ec78c93 Merge pull request #19362 from deepeshgarg007/travis-fix-revert
fix: Travis
2019-10-20 18:15:45 +05:30
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Mohamud Amin Ali
871193eb62 fix: removed annotations altogether for bmi 2019-10-20 11:50:15 +03:00
Mohamud Amin Ali
02279dff31 fix: appropriate annotations in BMI 2019-10-20 10:46:45 +03:00
Mohamud Amin Ali
43b22b4473 fix: a more legible chart for vitals 2019-10-20 10:34:39 +03:00
Deepesh Garg
c8d9a5305b Merge branch 'develop' into revert-19265-issue_fix 2019-10-20 12:18:34 +05:30
Deepesh Garg
06ace23a32 Merge pull request #18200 from alyf-de/datev_report_headers
feat(regional): enable automatic processing of DATEV reports
2019-10-19 22:56:59 +05:30
Deepesh Garg
979b042675 Merge pull request #19351 from mudux/develop
fix: Vitals chart in Patient History not showing
2019-10-19 17:24:41 +05:30
mudux
0d7359a826 fix: Vitals chart not diplaying 2019-10-19 11:10:42 +03:00
deepeshgarg007
55eff16760 fix: Value after depreciation fixes in asset,
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2019-10-19 12:16:25 +05:30
Deepesh Garg
dcb9c2031b Merge branch 'develop' into datev_report_headers 2019-10-19 11:34:57 +05:30
Khushal Trivedi
d02b026a4d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-10-18 17:04:26 +05:30
Khushal Trivedi
8750caa8e3 [Fix] - if its not multi company set it by default on BO 2019-10-18 17:01:16 +05:30
Rohan Bansal
83740de636 fix(selling): Add missing label to company address field 2019-10-16 15:16:00 +05:30
Rohan
d389ee457c Merge branch 'develop' into dev-work-order-bugs 2019-10-16 15:08:58 +05:30
Rohan
a77f534f7c Merge branch 'develop' into dev-serial-no-statuses 2019-10-16 15:08:57 +05:30
Khushal Trivedi
5f4b6d267c [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 13:40:58 +05:30
Khushal Trivedi
7084f07dab [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 13:40:33 +05:30
Khushal Trivedi
1675181e49 [Fix] - making customer/supplier field manadatory on order type condition on BO 2019-10-16 12:02:56 +05:30
Khushal Trivedi
01f8a4966a [Fix] - making customer/supplier field manadatory on order type condition 2019-10-16 11:40:27 +05:30
ashish-greycube
c41e44d964 fix: relative link in href 2019-10-16 10:38:31 +05:30
ashish-greycube
a32618dff4 add coupon code on selling card of desk 2019-10-16 10:26:25 +05:30
Shivam Mishra
8aa0a280b2 Revert "fix: Allow disabled links in issue doctype (#19265)"
This reverts commit 29a5756f87.
2019-10-15 19:17:20 +05:30
deepeshgarg007
3db65ef7e8 fix: Demo Script 2019-10-15 19:16:45 +05:30
joelios
441720df75 fix: linking of time_log to timesheet from project (frappe/erpnext #19315 ) 2019-10-15 15:42:51 +02:00
0Pranav
ad013264eb fix:margins 2019-10-15 16:45:37 +05:30
0Pranav
7c27436d21 fix:visibilty for forms 2019-10-15 16:45:24 +05:30
0Pranav
2f9ef85614 fix:typo 2019-10-15 16:44:28 +05:30
0Pranav
3d73a4f944 fix:readability for user 2019-10-15 16:43:40 +05:30
0Pranav
29c7d5fc63 fix:margins 2019-10-15 16:43:18 +05:30
Kenneth Sequeira
c269c68727 fix: allow read-only on new address form (#19304) 2019-10-15 16:34:55 +05:30
rohitwaghchaure
3af9ea8d7d Merge pull request #17117 from ashish-greycube/affiliate_and_coupon
feat: affiliate sales partner referral code and coupon code
2019-10-15 15:44:16 +05:30
Khushal Trivedi
e2bb950012 [fix] - from date cannot be greater than to date on blanket order 2019-10-15 15:03:13 +05:30
Rohit Waghchaure
a20fb650fe code cleanup 2019-10-15 14:42:09 +05:30
Sagar Gharge
f935e37925 [Fix] restricted duplicate guardians on student doctype (#19194) 2019-10-15 14:38:04 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +05:30
Nabin Hait
19070621af tests: added tests for PO scheduled date 2019-10-15 14:11:40 +05:30
Nabin Hait
a113861b0c fix: Always set required date based on min date on item table 2019-10-15 12:43:27 +05:30
ashish-greycube
cf24191fe5 feat: affiliate sales partner referral code and coupon code 2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
rohitwaghchaure
0bb99c15e5 fix: while submitting landed cost voucher user getting negative stock error (#19269) 2019-10-14 15:18:36 +05:30
Vijaya Raghavan
adc1529567 fixed typo
fixes type in filter parameter
2019-10-13 21:41:02 +05:30
Deepesh Garg
3f2c5c2319 Merge pull request #19288 from deepeshgarg007/analytics_chart_fix
fix: Chart fix in Analytics report when based on item
2019-10-13 09:33:31 +05:30
deepeshgarg007
683a89a415 fix: Chart fix in Analytics report 2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222)
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6 fix: production plan not showing grand total against sales order (#19283) 2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6 fix: project has not set in the sub assembly work order from production plan (#19284) 2019-10-12 16:48:57 +05:30
Anurag Mishra
8e937e9640 fix: packed items child table reset on amending docs (#19157) 2019-10-11 11:50:38 +05:30
Saqib
66762380ed fixes: internal issues (#19201)
* fix: Delivery Trip now has editable start address.

* fix: default party type not set in Journal Entry

* fix: maintainence visit purpose table not fetching item name

* fix: maintainence visit purpose table not fetching item name
2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
1d781f13b2 fix: fetch allocated amount for individual invoice (#19259) 2019-10-11 11:06:11 +05:30
Deepesh Garg
29a5756f87 fix: Allow disabled links in issue doctype (#19265)
* fix: Allow disabled links in issue doctype

* fix: Remove unwanted attribute
2019-10-11 11:04:48 +05:30
rohitwaghchaure
285344eb0e fix: over-bill error while making debit note against purchase return e… (#19270)
* fix: overbill error while making debit note against purchase return entry

* Update accounts_controller.py
2019-10-11 11:02:11 +05:30
Marica
f067447d9c fix: Margin and Discount percentage set correctly via 'Update Items' (#19276) 2019-10-11 10:47:09 +05:30
sahil28297
39d9cbc43d fix(patch): use db_insert instead of save to escape validations (#19279) 2019-10-11 10:43:50 +05:30
Deepesh Garg
2d064ee67a fix: Remove bold property from disable checkbox (#19280) 2019-10-11 10:43:38 +05:30
Himanshu
eba3a8e802 fix: get contact details (#19281) 2019-10-11 10:43:24 +05:30
Deepesh Garg
0fde204074 Merge pull request #19278 from Mangesh-Khairnar/fix-fixed-asset-register-name
fix: change category name from in store to in location
2019-10-11 09:14:46 +05:30
Kenneth Sequeira
a54b7542f1 fix: sales invoice labels (#19267) 2019-10-10 18:50:39 +05:30
Rohan
d8cbbc7d65 Merge branch 'develop' into dev-work-order-bugs 2019-10-10 17:47:31 +05:30
Rohan
6c8fe5ae02 Merge branch 'develop' into dev-serial-no-statuses 2019-10-10 17:47:30 +05:30
Mangesh-Khairnar
9cf818d347 fix: change category name from in store to in location 2019-10-10 14:28:52 +05:30
Suraj Shetty
a1de447662 Merge pull request #19277 from rohitwaghchaure/not_able_to_use_webhook
fix: name 'link_link_doctype' is not defined
2019-10-10 14:24:04 +05:30
Suraj Shetty
a6e53410b0 Merge branch 'develop' into not_able_to_use_webhook 2019-10-10 14:22:48 +05:30
Rohit Waghchaure
4494d46020 fix: name 'link_link_doctype' is not defined 2019-10-10 14:17:06 +05:30
rohitwaghchaure
95161a0df4 Merge pull request #19266 from rohitwaghchaure/fixed_imponibileimporto_for_the_previous_row_total_develop
fix: ImponibileImporto not getting calculated properly
2019-10-09 18:16:26 +05:30
Pranav Nachanekar
aa918e8528 moved validations to sepeate functions 2019-10-09 15:49:48 +05:30
Marica
ccad0a4cf9 feat: Stock Quick Balance (#19123)
* feat: Stock Quick Balance

It will display the stock balance and stock value given the date and warehouse
Item code can be fed or barcode can be scanned to retrieve the values

* fix: Codacy fixes

* fix: Renamed to Quick Stock Balance and minor fixes

Refactored code , combined functions to make it DRY
Added permissions for Stock User and Manager
Added more context to naming
2019-10-09 15:24:58 +05:30
Pranav Nachanekar
2c99594688 remove: styles for non existant radio 2019-10-09 15:22:57 +05:30
Pranav Nachanekar
9ccc43980b Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-10-09 14:17:37 +05:30
Pranav Nachnekar
50e66d81de fix: use get_single_value
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:43:18 +00:00
Pranav Nachanekar
604febb398 fix: set_verified method contained js 2019-10-09 14:09:47 +05:30
Pranav Nachanekar
e434e8e2e2 fix: formatting 2019-10-09 14:08:01 +05:30
Pranav Nachnekar
96930e25f3 fix: readability
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:31:37 +00:00
Pranav Nachnekar
5e4ec85574 remove:unnecessary translation
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:23:54 +00:00
Rohit Waghchaure
c10064ae2c fix: ImponibileImporto not getting calculated properly 2019-10-09 13:50:16 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Deepesh Garg
a00c98bea7 Merge pull request #19260 from Anurag810/Trends-Fixes
fix: Query Condition On Billing date filters in Purchase invoice trends Report.
2019-10-07 17:40:24 +05:30
Mangesh-Khairnar
3cc41634c5 Merge pull request #19161 from vijaywm/lwp_half_day_fix
fix: LWP calculation in multi-day leaves having half day
2019-10-07 17:05:22 +05:30
Mangesh-Khairnar
d5e9cd72df Merge branch 'develop' into lwp_half_day_fix 2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f style(salary-slip): fixed formatting 2019-10-07 16:08:15 +05:30
Anurag Mishra
fe5890b828 fix: Query Condition On Billing date filters 2019-10-07 14:27:07 +05:30
Pranav Nachnekar
1f1b7eb7d5 Merge branch 'develop' into develop 2019-10-07 06:12:45 +00:00
Deepesh Garg
817443c5dd Merge pull request #19253 from Thunderbottom/e-invoice-disc-fix
chore: check if discount_percentage exists
2019-10-06 23:47:52 +05:30
rohitwaghchaure
16b8e7c432 Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12
fix: not able to submit the work order
2019-10-05 23:29:44 +05:30
Chinmay D. Pai
01aca675ef chore: check if discount_percentage exists
fixes TypeError: '>' not supported between instances of 'NoneType' and 'float'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-05 10:18:21 +05:30
Rohit Waghchaure
484e1fb218 fix: not able to submit the work order 2019-10-04 17:58:21 +05:30
Pranav Nachanekar
e18388ade3 fix:add exception for no opportunity 2019-10-04 16:32:32 +05:30
sahil28297
2caf32d421 fix(patch): Reload Leave Type (#19240) 2019-10-04 16:24:53 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +05:30
Deepesh Garg
41a6548acb fix: Label and dependes on fixes in Bank Account (#19245) 2019-10-04 16:22:00 +05:30
Pranav Nachanekar
911e034d1c fix: syntax error 2019-10-04 15:50:02 +05:30
Pranav Nachanekar
0082b78075 fix:incosistent tabs and spaces 2019-10-04 15:36:36 +05:30
Pranav Nachanekar
bfe18d6085 feat:assign appointments from opportunity 2019-10-04 14:41:54 +05:30
Shivam Mishra
ba2faecdc7 fix: null check for valuation rate (#19195)
* fix: null check for valuatiomn rate

* fix: add rate for item in test records

* refactor: use flt instead of throwing error

* Revert "fix: add rate for item in test records"

This reverts commit f8cebe65f5.
2019-10-04 11:58:04 +05:30
Pranav Nachanekar
c1bc0f9dfb fix: added sections for settings 2019-10-04 11:36:53 +05:30
Pranav Nachanekar
25148d0de5 fix:readability 2019-10-04 11:32:39 +05:30
Pranav Nachanekar
9e36a9ee04 fix: move enable check to serverside 2019-10-04 11:28:29 +05:30
Pranav Nachanekar
faf39ecef4 fix:removed print statements 2019-10-04 11:12:50 +05:30
Pranav Nachanekar
22189ec9e8 remove unnecessary doctype 'Timezone' 2019-10-04 11:07:04 +05:30
Deepesh Garg
8b741cfefb Merge pull request #19228 from Mangesh-Khairnar/fix-stock-ageing-report
fix(stock-ageing): filter none values from the fifo queue
2019-10-04 09:00:13 +05:30
Deepesh Garg
894604201b Merge pull request #19242 from thefalconx33/git-issues
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
2019-10-03 22:39:04 +05:30
Mangesh-Khairnar
9351313186 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report 2019-10-03 19:21:17 +05:30
Mangesh-Khairnar
ea70c6f696 fix: dynamically filter fifo queue 2019-10-03 19:19:42 +05:30
Pranav Nachanekar
a1d39cab21 fix: travis 2019-10-03 18:26:02 +05:30
Pranav Nachanekar
d40c020e0e fix:variable names 2019-10-03 17:43:31 +05:30
Pranav Nachanekar
bec88bc52a fix: exists return tuple not string 2019-10-03 16:58:38 +05:30
Pranav Nachanekar
afe52e8e09 feat: add check for toggling the route 2019-10-03 16:35:08 +05:30
Pranav Nachanekar
72aac09d62 fix:remove tearDown from test 2019-10-03 16:09:50 +05:30
Pranav Nachanekar
43331564b4 fix:class variable in tests 2019-10-03 15:29:09 +05:30
Pranav Nachanekar
42cf5f279f fix:added class variables to test 2019-10-03 14:26:21 +05:30
Pranav Nachanekar
8640a01f85 remove duplicate day validation 2019-10-03 13:32:57 +05:30
Pranav Nachanekar
1dccc039b7 fix:add tear down to tests 2019-10-03 13:32:46 +05:30
Pranav Nachanekar
59c543570a feat: made timeslots into flex 2019-10-03 13:18:13 +05:30
thefalconx33
4723da0251 fix: #19239 2019-10-03 13:06:43 +05:30
Pranav Nachanekar
76cbb9132f fix: more test errors 2019-10-03 12:50:55 +05:30
Pranav Nachanekar
4856645b6d fix:styling for time-slot 2019-10-03 12:45:42 +05:30
Pranav Nachanekar
c5420bb453 fix: remove validation for repeated days 2019-10-03 12:06:43 +05:30
Pranav Nachanekar
93670fedda timezone manipulation using pytz 2019-10-03 11:58:02 +05:30
Pranav Nachanekar
1dcedb5054 fix: empty leads and appointment in test 2019-10-03 11:56:54 +05:30
Pranav Nachanekar
c6da5fb38e fix:guess timezone using moment 2019-10-03 11:56:23 +05:30
rohitwaghchaure
f4245a2d9c minor: show BOM related operations (#19237) 2019-10-03 11:41:36 +05:30
gavin
be8f6f0d65 fix: report ~ lead conversion time (#19232) 2019-10-03 11:36:04 +05:30
Frappe PR Bot
045ca33692 feat: Updated translation (#19227) 2019-10-03 11:15:41 +05:30
Suraj Shetty
91c17a6f14 Merge pull request #19204 from hrwX/global_search_modules
fix(Global Search): add doctypes for modules
2019-10-02 21:14:58 +05:30
Himanshu
c18b54fc08 Merge branch 'develop' into global_search_modules 2019-10-02 16:39:38 +05:30
Sahil Khan
c5a6e9da15 Merge branch 'develop' into version-12 2019-10-02 16:36:54 +05:30
Sahil Khan
80ed98c87a bumped to version 12.1.6 2019-10-02 16:56:54 +05:50
Himanshu
2985cffc52 Merge branch 'develop' into global_search_modules 2019-10-02 16:36:19 +05:30
Himanshu Warekar
2935751f75 Merge branch 'global_search_modules' of https://github.com/hrwx/erpnext into global_search_modules 2019-10-02 16:34:19 +05:30
Himanshu Warekar
23c916c0d6 fix: global search dict in hooks 2019-10-02 16:32:53 +05:30
Saurabh
509dcd9ad0 Merge pull request #19097 from prssanna/shopify
fix(Integrations): Shopify Integration
2019-09-30 20:07:04 +05:30
Saurabh
039679cad1 Merge branch 'develop' into shopify 2019-09-30 19:08:44 +05:30
Chinmay Pai
5dfc74c851 fix(amazon-mws): python3 compatibility changes (#19210)
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-30 16:59:58 +05:30
Chinmay Pai
9d26c69c4a fix(amazon-mws): python3 compatibility changes (#19209)
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-30 16:59:42 +05:30
DeeMysterio
20194c4cc5 rename return/invoice to Purchase return/invoice (#19212) 2019-09-30 16:59:15 +05:30
Rohan
d463c346fe fix: set no-copy on some contract fields (#19208) 2019-09-30 16:37:29 +05:30
Nabin Hait
25e043766a fix: Get leave approvers in Employee leave balance report (#19211) 2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
905573700b feat(report): fixed asset register (#19164)
* feat(report): fixed asset register

* fix: fetch supplier and check for asset status

* fix: fetch vendor name from purchase invoice

* style(fixed-asset-register): use conventional column name

* Update fixed_asset_register.py
2019-09-30 16:10:46 +05:30
Himanshu
37f4316df0 Update setup_wizard.py 2019-09-30 16:02:24 +05:30
Marica
de15cc1387 fix: Work order dialog box 'Select Quantity' on clicking 'Finish' (#19136)
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
2019-09-30 15:36:33 +05:30
Pranav Nachanekar
2ea9b3e6f2 fix:test appointments 2019-09-30 15:35:38 +05:30
rohitwaghchaure
8d889ef80e fix: update the pending qty in production plan on completion of work order (#19180) 2019-09-30 15:22:12 +05:30
Deepesh Garg
b54f0fb388 fix: Party column empty in accounts receivable/ payable summary (#19205) 2019-09-30 15:19:56 +05:30
Suraj Shetty
1da81d8755 Merge pull request #19206 from hrwX/disp_mobile_no
fix: Show primary mobile no
2019-09-30 15:18:01 +05:30
Suraj Shetty
b093ea1f0a feat: Remove Leaderboard from ERPNext (#19156)
feat: remove Leaderboard from ERPNext
2019-09-30 15:17:26 +05:30
rohitwaghchaure
ed1cc18ab5 fix: stock ledger report not showing data if the UOM filter has selected (#19179) 2019-09-30 15:15:52 +05:30
Marica
147af15268 fix: Added 'Manual' % Complete Method in Project (#19175)
Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks
2019-09-30 15:11:15 +05:30
prssanna
1f512b36c5 fix(patch): set app_type as private 2019-09-30 14:57:21 +05:30
hrwx
ebc0e1ca8a fix: remove return statement 2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9 fix: sku 2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf fix: permissions 2019-09-30 14:56:39 +05:30
hrwx
5aa8743024 changes 2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
f380b215b2 fix: shopify integration 2019-09-30 14:56:39 +05:30
Himanshu
201bcaf2ca fix(Company): Do not set default account if left blank (#19131)
* chore: use dict to set_default_account

* fix: dont override expense account if left empty

* fix: set accounts only if new company

* chore: fix alignment

* fix: test cases
2019-09-30 14:56:08 +05:30
Himanshu
7d6f52f4ab fix: add system user perm in patient (#19133) 2019-09-30 14:40:56 +05:30
Mangesh-Khairnar
d8763d7d65 fix: allow rename/merge in opportunity (#19202) 2019-09-30 14:39:46 +05:30
Himanshu Warekar
46831c4c20 fix: show mobile no 2019-09-30 14:34:56 +05:30
Pranav Nachanekar
14a3e64c80 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-30 13:58:48 +05:30
Pranav Nachanekar
7f4bc64d22 fix:appointment tests exist check 2019-09-30 13:58:42 +05:30
Himanshu
32b587b3a0 Merge branch 'develop' into global_search_modules 2019-09-30 13:44:42 +05:30
Himanshu Warekar
21abc3aa50 fix: add doctypes for modules 2019-09-30 13:40:02 +05:30
Suraj Shetty
4c3f0b94a4 Merge branch 'develop' into leaderboard 2019-09-30 13:11:19 +05:30
Suraj Shetty
fcb6edf571 Merge branch 'leaderboard' of github.com:prssanna/erpnext into leaderboard 2019-09-30 13:09:53 +05:30
Suraj Shetty
d23c9987ed style: Fix Codacy 2019-09-30 13:09:12 +05:30
Rohan
60b852bb12 Merge branch 'develop' into dev-work-order-bugs 2019-09-30 13:08:12 +05:30
Rohan
c86cdd609e Merge branch 'develop' into dev-serial-no-statuses 2019-09-30 13:08:10 +05:30
Deepesh Garg
91aa671a23 Merge pull request #19137 from marination/invoice-discounting
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
2019-09-30 12:43:09 +05:30
Pranav Nachanekar
250bae2603 fix:appointment tests exist check 2019-09-30 12:40:25 +05:30
Suraj Shetty
6bd4509923 Merge branch 'develop' into leaderboard 2019-09-30 12:35:39 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037)
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
2019-09-30 12:15:39 +05:30
Suraj Shetty
38794c0ca1 Merge branch 'develop' into leaderboard 2019-09-30 11:54:28 +05:30
prssanna
b874922404 fix: whitelist leaderboard functions 2019-09-30 11:12:10 +05:30
Deepesh Garg
296bf9ef42 chore: Add standard chart of accounts template for El Salvador (#19151)
* chore: Add standard chart of accounts template for El Salvador

* fix: Renane template file
2019-09-30 11:02:49 +05:30
Deepesh Garg
7b1b3f0fa8 fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189) 2019-09-30 11:01:05 +05:30
Rucha Mahabal
3564ac7c88 fix: don't create debit/credit note automatically (#19185) 2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8 feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046) 2019-09-30 10:57:32 +05:30
Roland
6edce82aef do not require address in webshop (#19096)
fix: #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available
2019-09-30 10:56:22 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68 Merge branch 'develop' into invoice-discounting 2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009)
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
2019-09-30 10:08:15 +05:30
Mangesh-Khairnar
77f22635f2 fix(stock-ageing): filter none values from the fifo queue 2019-09-27 17:50:52 +05:30
prssanna
119c976ad1 fix: missing comma 2019-09-27 16:28:08 +05:30
prssanna
8f7ed71e9e fix: add df to leaderboard config 2019-09-27 15:09:40 +05:30
Himanshu
83b0b2adec feat(Global Search): Add fixtures for global search (#19049) 2019-09-27 00:59:48 +05:30
Mangesh-Khairnar
9a8549a361 Merge pull request #19187 from Mangesh-Khairnar/rename-job-applicant
feat(job-applicant): allow rename/merge with existing
2019-09-26 19:09:31 +05:30
Mangesh-Khairnar
a01ebe0a54 Merge branch 'develop' into rename-job-applicant 2019-09-26 18:41:28 +05:30
Nabin Hait
001edb4464 refactor: Reposting utility of Stock ledger (#19155) 2019-09-26 16:44:35 +05:30
sahil28297
a9ff4f6688 fix(Report): Sales Register 2019-09-26 13:58:00 +05:30
prssanna
d095acdad5 fix: use orm for queries 2019-09-26 13:41:24 +05:30
Shivam Mishra
8781dc8ca3 fix: footer link redirect to landing pages (#19181) 2019-09-26 12:53:52 +05:30
Mangesh-Khairnar
f82ea857a0 feat(job-applicant): allow rename/merge with existing 2019-09-26 12:29:41 +05:30
Marica
54becbb33a fix: Codacy fix(whitespaces) 2019-09-26 11:24:34 +05:30
marination
a877115ff4 fix: Minor changes
Added value in fetch from and removed client side code
2019-09-26 11:08:39 +05:30
marination
e7f67592a8 fix: Made outstanding amount field read only and added validation
Made the field editable so that outstanding amount can be adjusted
2019-09-26 10:58:02 +05:30
marination
ed004018d6 fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
It wrongly fetched grand total from sales invoice instead of outstanding amount.
2019-09-26 10:58:02 +05:30
Deepesh Garg
d138633c5b Merge pull request #19163 from thefalconx33/small-fixes
fix: Supplier field not getting populated in serial no on creation of asset
2019-09-25 22:09:41 +05:30
Marica
23d7b09389 fix: Item Rate within Update Items in Sales order (#19172)
Blocked negative discount percentage, which affected the item rate every time Update Items action was taken
2019-09-25 17:17:36 +05:30
Rucha Mahabal
132323462c fix(Report): Sales Register (#19166) 2019-09-25 16:03:45 +05:30
Pranav Nachanekar
fd46bf2616 fix codacy 2019-09-25 16:01:48 +05:30
Pranav Nachanekar
774167192a Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-25 13:12:32 +05:30
Pranav Nachanekar
291e161793 Added permissions for sales user 2019-09-25 13:11:04 +05:30
Nabin Hait
2064dfc5a9 fix: Handling payments against credit/debit notes and party currency (#19154) 2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451 enhancement(tds-monthly-payable): remove zero value transaction (#19141) 2019-09-24 19:46:06 +05:30
Rucha Mahabal
c6b548b5b2 fix(Stock): item variant description (#19134) 2019-09-24 19:17:13 +05:30
gavin
fed5788c50 fix: patch fix (#19147) 2019-09-24 19:15:29 +05:30
Rucha Mahabal
824376a045 fix(Journal Entry): Opening Entry not fetching accounts (#19148) 2019-09-24 19:13:55 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162)
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
2019-09-24 19:10:59 +05:30
thefalconx33
c15cc8fc28 fix: #18624 2019-09-24 18:49:16 +05:30
Sahil Khan
6211a5bc3b Merge branch 'develop' into version-12 2019-09-24 18:16:53 +05:30
Sahil Khan
946f68f7f0 bumped to version 12.1.5 2019-09-24 18:36:53 +05:50
Vijaya Raghavan
e9affd97ac LWP for half day in multi day leave 2019-09-24 17:04:32 +05:30
Pranav Nachanekar
9f86022c2b fix: Error in test setUp 2019-09-24 16:07:41 +05:30
Pranav Nachanekar
d45c12b382 Formatting 2019-09-24 16:07:02 +05:30
prssanna
3f1444e410 fix: get leaderboards using hooks 2019-09-24 13:51:22 +05:30
prssanna
3bd15d3aaa feat: remove leaderboard from erpnext 2019-09-24 13:06:31 +05:30
Pranav Nachanekar
c9cf5aebea Changed required values, add clientside validation 2019-09-24 12:08:37 +05:30
Rohan
a51a304cf0 Merge branch 'develop' into dev-work-order-bugs 2019-09-24 11:53:00 +05:30
Nabin Hait
7ab861fe95 Merge branch 'develop' into develop 2019-09-24 11:50:38 +05:30
Nabin Hait
786d7bd3d4 Merge branch 'develop' into dev-serial-no-statuses 2019-09-24 11:50:33 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140)
* fix: Travis

* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Pranav Nachanekar
558d44e519 Removed auto-assignment for unverified appointments 2019-09-24 11:33:57 +05:30
Deepesh Garg
2e7419d78f fix: Do not validate warehouse in case of Repack (#19050) 2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b fix: get correct warehouse for product bundle (#19130) 2019-09-24 10:03:34 +05:30
Anurag Mishra
5a61880e6a fix: provided delete permission (#19143) 2019-09-24 09:54:54 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Pranav Nachanekar
8393ebbbca Fixed missing permission in update 2019-09-23 17:14:31 +05:30
Pranav Nachanekar
8b744b2d03 Added request verification and url encoding 2019-09-23 15:55:35 +05:30
rohitwaghchaure
8dd4699f10 feat: Allow to make landed cost voucher against the asset item (#19121) 2019-09-23 15:03:52 +05:30
rohitwaghchaure
e18f7b91c3 Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop
fix: removed mandatory property for address field in quick entry
2019-09-23 14:48:27 +05:30
Pranav Nachanekar
a35e34b5f0 FIxed typos and create_lead method 2019-09-23 14:38:22 +05:30
Pranav Nachanekar
83dee07420 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-23 14:25:55 +05:30
Pranav Nachanekar
3eccb84eaa Fixed update method 2019-09-23 14:25:42 +05:30
Pranav Nachanekar
e40b100110 Fixed update method 2019-09-23 14:23:04 +05:30
Pranav Nachanekar
b6b27d9256 Corrected moving to doctype for email 2019-09-23 14:16:13 +05:30
Pranav Nachanekar
7b7962d28c Added test cases 2019-09-23 13:05:18 +05:30
Pranav Nachanekar
77744766dd Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-23 11:52:37 +05:30
Pranav Nachanekar
dcfc849946 Moved email to appoitnmetn doctype 2019-09-23 11:52:26 +05:30
Pranav Nachanekar
d9ab09ab2b Moved email to appoitnmetn doctype 2019-09-23 11:28:17 +05:30
Pranav Nachanekar
f8cc86bfed Moved email from class variable to doctype
Formatting
Made methods which link other doctypes idempotent
2019-09-23 11:28:05 +05:30
Pranav Nachanekar
0800031c0d Addee email to appointment doctyoe
and asthetic changes
2019-09-23 11:26:46 +05:30
Pranav Nachanekar
6b0fea16b6 Added buttons to linked docs 2019-09-23 11:26:18 +05:30
Anurag Mishra
2c60f6419e feat: missmatching amount in GST Sales report and itemised sales report (#19116) 2019-09-20 23:00:09 +05:30
Suraj Shetty
462d9cb331 feat: "Purchase Order items to be Received or Billed" report (#19091)
* feat: Init "Purchase Order items to be received or billed" report

* fix: Rename report

* fix: Column name
2019-09-20 18:30:22 +05:30
Mangesh-Khairnar
a44e8afe71 feat: add bank account in payroll entry (#19021)
* fix(journal-entry): change fieldname from bank account no to bank account

* fix: add payroll entry in bank dashboard

* fix: fetch account from bank account

* fix: minor changes

* patch: check for bank account no column before updating

* fix: use rename field function
2019-09-20 18:19:47 +05:30
Sahil Khan
5888efbb4e Merge branch 'develop' into version-12 2019-09-20 15:17:21 +05:30
Sahil Khan
0c665e5638 bumped to version 12.1.4 2019-09-20 15:37:21 +05:50
Rohit Waghchaure
1f9a84f165 fix: removed mandatory property for address field in quick entry 2019-09-20 12:18:23 +05:30
Pranav Nachanekar
9c0f462336 Fixed Syntax errors 2019-09-20 10:51:56 +05:30
Pranav Nachanekar
07bb46e3fb Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-20 10:47:59 +05:30
Pranav Nachanekar
aa7d0c0163 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-20 10:47:18 +05:30
Pranav Nachanekar
a9f5a697bb Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-20 10:45:48 +05:30
Pranav Nachanekar
73420e462f Added email 2019-09-20 10:44:52 +05:30
Pranav Nachanekar
fa4a2a53e8 Added email 2019-09-20 10:41:59 +05:30
Pranav Nachanekar
df1a5a9633 Added flow for verifying emails 2019-09-20 10:08:48 +05:30
Pranav Nachanekar
5324234bd0 Removed required lead 2019-09-20 10:08:26 +05:30
rohitwaghchaure
30f3354a7a Merge pull request #19114 from marination/report-fix
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 19:01:05 +05:30
Anurag Mishra
c16fb9eb9d fix: dashboard button not working (#19094) 2019-09-19 18:12:39 +05:30
rohitwaghchaure
6bbc834f8f Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
2019-09-19 18:01:03 +05:30
marination
8590112faa fix: Report 'Payment Period based On Invoice Date' 2019-09-19 17:48:23 +05:30
Rohit Waghchaure
6daab3ca89 fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given) 2019-09-19 17:01:49 +05:30
Rucha Mahabal
51eabfe352 fix: subcontracting material transfer dialog in Purchase Order (#19111)
* fix: subcontracting material transfer dialog in Purchase Order

* fix: dialog title
2019-09-19 16:57:03 +05:30
Mangesh-Khairnar
231472bc20 Merge pull request #19102 from ruchamahabal/attendance_template_fix
fix(HR): upload attendance template not marking attendance
2019-09-19 14:20:05 +05:30
Mangesh-Khairnar
68a4c70b72 Merge branch 'develop' into attendance_template_fix 2019-09-19 13:34:39 +05:30
Pranav Nachanekar
ca2509423a Added permissions for HR manager 2019-09-19 12:36:51 +05:30
Pranav Nachanekar
4109f88c04 Linked send_reminder in calendar event
to Appointment Booking Settings
2019-09-19 12:08:10 +05:30
Pranav Nachanekar
5bf52ebed6 limit assigment load to appointment day 2019-09-19 11:47:54 +05:30
Pranav Nachanekar
ba99945359 Prevent booking of appointments for past times 2019-09-19 11:21:05 +05:30
Suraj Shetty
28d182af15 fix: Permission issue in Total Stock Summary report (#19110)
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
2019-09-19 11:13:22 +05:30
Rohan
8a097c8627 fix: only set times if job card is filled (#19107) 2019-09-18 20:05:49 +05:30
Rucha Mahabal
1ba83427e5 fix: asset maintenance TypeError during date comparisons (#19098) 2019-09-18 20:04:15 +05:30
Marica
cef75a5987 fix: Customer Credit Balance Report query fix (#19105) 2019-09-18 20:00:39 +05:30
Marica
d793e39b6d fix: Customer Credit Balance Report query fix (#19104) 2019-09-18 19:59:31 +05:30
Pranav Nachanekar
ec1dae023c styling 2019-09-18 16:13:29 +05:30
Pranav Nachanekar
7d476a3e35 Moved lead assignment to the controller 2019-09-18 15:33:31 +05:30
Pranav Nachanekar
81449ece54 fix:Linking lead 2019-09-18 14:33:40 +05:30
Pranav Nachanekar
7323bfdad7 Styling and bug fixes 2019-09-18 14:33:10 +05:30
Rohan
b9c1dad2e6 Merge branch 'develop' into dev-serial-no-statuses 2019-09-18 13:24:28 +05:30
Rucha Mahabal
aeaf416d6d fix: upload attendance template not marking attendance 2019-09-18 13:11:30 +05:30
Pranav Nachanekar
3c8bea65ef Merged with local 2019-09-18 10:39:11 +05:30
Pranav Nachnekar
57c311f8e9 Merge branch 'develop' into develop 2019-09-18 10:33:39 +05:30
rohitwaghchaure
780fb8a4e5 fix: set stock adjustment account for the raw materials instead of COGS (#19090) 2019-09-17 18:46:49 +05:30
rohitwaghchaure
d019d28bc9 fix: Customer Ledger Summary report not working on python 3 (#19092) 2019-09-17 18:45:59 +05:30
Sahil Khan
50e591b815 Merge branch 'develop' into version-12 2019-09-17 17:11:15 +05:30
Sahil Khan
4f96ec1b6c bumped to version 12.1.3 2019-09-17 17:31:14 +05:50
sahil28297
0816c0bd5e Merge pull request #19093 from Aerele/fix_indentation
fix: indentation error in stock ageing
2019-09-17 17:08:35 +05:30
sahil28297
c1930fa64d Merge branch 'develop' into fix_indentation 2019-09-17 17:08:16 +05:30
Pranav Nachanekar
91a564989f Styling and PR review changes 2019-09-17 16:58:41 +05:30
kaviya
9e4f674fb9 fix: indentation error in stock ageing
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
2019-09-17 16:02:11 +05:30
Suraj Shetty
627a3dcd6d feat: Default energy point rules (#19003)
* feat: Add default energy point rules during install

* fix: Add completed_by field to task doctype

* fix: Rule data

* fix: Add default rules for opportunity

* fix: Add a patch to create default energy point rules

* fix: Default success action message

* fix: Use .items() instead of .iteritems()

* fix: Add "create_default_energy_points" patch entry

* fix: Reload Energy Point Rule to fix patch

* fix: Import frappe
2019-09-17 15:54:41 +05:30
Suraj Shetty
af2eac4334 fix: Create error log if something goes wrong while call log creation (#19055)
* fix: Create error log if something goes wrong while call log creation

- For better debbugging

* fix: Rollback if any error occurs during call log creation
2019-09-17 15:53:23 +05:30
Pranav Nachnekar
33daf281bd Merge branch 'develop' into develop 2019-09-17 14:14:16 +05:30
Suraj Shetty
f9069a9873 fix: Return employee_emails instead of employee (#19085)
fix: Return employee_emails instead of employee
2019-09-17 13:50:42 +05:30
Suraj Shetty
7563bdf6f8 Merge branch 'develop' into fix-exotel-call-log 2019-09-17 13:28:59 +05:30
rohitwaghchaure
ad5fc07652 Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11
fix: plc conversion issue for offline pos
2019-09-17 13:24:41 +05:30
Suraj Shetty
6b9b92afb0 fix: Return employee emails instead of employee 2019-09-17 13:22:40 +05:30
Rohit Waghchaure
094612dc02 fix: plc conversion issue for offline pos 2019-09-17 13:04:28 +05:30
Faris Ansari
4fe67236ed fix: Python 3 fixes for MWS Connector (#18986) 2019-09-17 12:57:51 +05:30
Deepesh Garg
c5c3860c5c fix: Mandatory accounting dimensions while creating asset depreciation entry (#19073)
* fix: Mandatory accounting dimensions while creating asset depreciation entry

* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42 fix: not able to change the account type in parent company account head (#19083) 2019-09-17 12:49:52 +05:30
Mangesh-Khairnar
5d41e3848d fix: do not submit depreciation journal entry when workflow is enabled (#19000) 2019-09-17 12:45:14 +05:30
Pranav Nachnekar
a8752db012 Typo and styling fixes
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-09-16 20:02:20 +05:30
Frappe PR Bot
abd434f656 feat: Updated translation (#19077) 2019-09-16 19:57:27 +05:30
Suraj Shetty
bc001d2d9a feat: Add stock ageing data to stock balance report (#19036)
* feat: Add stock ageing data to stock balance report

* fix: Use fifo queue warehouse wise

* fix: "Stock Ledger Entry" get query

* fix: Remove unwanted quotes in item details query

* fix: Check if no SLE was passed

* fix: Codacy

* fix: Add logic to include additional UOM columns

* fix: Show stock ageing data optionally
2019-09-16 19:57:04 +05:30
Nabin Hait
b50b5095ad fix: Added field disabled instead of enabled in cost center (#19065) 2019-09-16 19:44:37 +05:30
Marica
bac4b93639 fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066)
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
2019-09-16 19:44:28 +05:30
rohitwaghchaure
76df782006 fix: Decimal point issue for e-invoice (#19068) 2019-09-16 19:43:17 +05:30
Mangesh-Khairnar
dce04b7335 fix: filter for payment order (#19070) 2019-09-16 19:40:27 +05:30
Chinmay Pai
7e8e4783a1 fix: remove function call from kwarg (#19072)
this commit fixes mail not being sent for leave applications

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-16 19:14:42 +05:30
rohitwaghchaure
bb5f99a34d Merge pull request #19071 from rohitwaghchaure/naming_series_added_for_the_asset_movement_develop
minor: naming series added in the asset movement
2019-09-16 19:10:54 +05:30
Rohit Waghchaure
40c5bf9e94 fix: naming series added in the asset movement 2019-09-16 16:42:42 +05:30
Faris Ansari
8beca68948 feat: Scan Barcode using Camera in mobile (#19033)
* feat: Scan Barcode using Camera in mobile

* fix: Use input-group for scan button

* fix: Muted camera button
2019-09-16 15:20:10 +05:30
Rucha Mahabal
2818b5bbe7 fix: 'link to material request' button not showing any message if no Material Request found (#19064) 2019-09-16 15:16:38 +05:30
Deepesh Garg
8cc2f83bd5 fix: Fetch scrap items from BOM if purpose is repack (#19056) 2019-09-16 14:49:12 +05:30
Nabin Hait
57835f0a37 fix: Company is required to get bin details (#19058) 2019-09-16 14:48:16 +05:30
Rushabh Mehta
72dcb51177 fix(minor): opportunity_from may not be selected (#19063) 2019-09-16 14:47:43 +05:30
Sammish Thundiyil
a2a9b39794 modified: erpnext/accounts/doctype/account/account.json (#19032) 2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96 fix: Invalid reference doctypes for accounting dimensions (#19027)
* fix: Invalid reference doctypes for accounting dimensions

* fix: Add server side validation for accounting doctypes

* fix: set fieldname and label before insert
2019-09-16 13:26:37 +05:30
Nabin Hait
4432a874de Merge branch 'develop' into dev-work-order-bugs 2019-09-16 13:10:47 +05:30
Nabin Hait
74fdfff5b5 fix: Set todo status as Closed if task completed (#19059) 2019-09-16 13:06:37 +05:30
rohitwaghchaure
87000977d5 Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop
fix: user can able to change rate and discount even if they don't have permissions
2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0 fix: user can able to change rate and discount even if they don't have permission 2019-09-16 11:15:22 +05:30
barredterra
5bd8562b5a Merge branch 'develop' into datev_report_headers 2019-09-14 20:09:39 +02:00
rohitwaghchaure
4a323463f7 fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices (#19039) 2019-09-13 18:36:57 +05:30
Deepesh Garg
9c3fd8dbc3 Merge pull request #19044 from marination/gstr-error
fix: Changed error message in GSTR-1 Report
2019-09-13 18:04:38 +05:30
Pranav Nachanekar
018f0d3bbd Fixed issue: agents weren't looked up in settings 2019-09-13 16:52:06 +05:30
marination
3d433efdfe fix[minor]: Changed error message in GSTR-1 Report
Error message didn't prompt where the user has to add the missing value(GSTIN No.)
2019-09-13 16:28:11 +05:30
Pranav Nachanekar
1cd762e9d0 Added ajuto assignment 2019-09-13 15:56:54 +05:30
Pranav Nachanekar
d88f850d0f removed debugger 2019-09-13 15:56:47 +05:30
Pranav Nachanekar
cf045d86b0 fixed typo 2019-09-13 15:55:54 +05:30
Nabin Hait
93a9c08116 fix: Allocate payment amount in reference table on change of payment amount (#19041) 2019-09-13 15:48:50 +05:30
Chinmay Pai
b3c732daf5 refactor(plaid): move configuration from site_config to doctype (#18712)
* feat(plaid): move plaid from site_config to doctype

plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* feat(plaid): make changes to plaid_settings and add patch

* remove all references for get()-ing plaid variables from frappe.conf
  and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
  frappe.conf to plaid_settings doctype

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix(plaid): use get_single_value for Plaid Settings

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

* chore: reload plaid_settings before running patch

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove useless semicolon

fuck codacy

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-13 15:48:08 +05:30
Suraj Shetty
f8899827e0 fix: Add Exotel Settings to integration module (#19025)
* fix: Add Exotel Settings to integration module

* fix: Add description
2019-09-13 12:27:00 +05:30
Suraj Shetty
6996c2d17d fix: Fetch image from user if available (#19030) 2019-09-13 12:25:06 +05:30
Mangesh-Khairnar
755020843b fix: leave balance reports (#18984)
* fix: process allocation expiry

* fix: leave balance summary filter

* fix: opening and closing balance

* fix: check for department leave approvers

* fix: minor changes

* fix: consider leave approver in employee

* Update employee_leave_balance_summary.py
2019-09-13 11:07:09 +05:30
Rucha Mahabal
72949e7f73 fix: share transfer validations for journal entry (#19018)
* fix share transfer validations for journal entry

* fix: share transfer test

* fix: tests
2019-09-13 11:05:40 +05:30
Suraj Shetty
e4f8bda1ea Merge pull request #19031 from surajshetty3416/fix-call-popup-name
fix: Make -> Create in call popup
2019-09-12 22:14:24 +05:30
Suraj Shetty
cdce6c746f fix: Make -> Create 2019-09-12 22:04:49 +05:30
Himanshu
d51f7af9ab fix: add contact phone to sales order (#19012) 2019-09-12 19:19:17 +05:30
Suraj Shetty
3b0ec48b0c fix: Naming series check to avoid duplicate entry error (#19015)
* fix: Naming series check to avoid duplicate key error

* fix: Check for existence of naming series
2019-09-12 19:18:44 +05:30
Nabin Hait
a5dfe0725f fix: payment against shareholder (#19019) 2019-09-12 19:17:24 +05:30
Shivam Mishra
a3095c987a fix: optimized query (#19026)
Co-authored-by: nabinhait
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
2019-09-12 17:28:37 +05:30
Rohan
a656151ee9 fix: operating cost calculation in JS 2019-09-12 16:00:25 +05:30
Pranav Nachanekar
a3b8c77af1 Fixed leads 2019-09-12 15:19:22 +05:30
Pranav Nachanekar
1564f1476c Added customer to calender event 2019-09-12 14:24:28 +05:30
Pranav Nachanekar
c9c8e19ec2 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-12 14:13:18 +05:30
Sammish Thundiyil
504e52ff46 refactor: cost center (#19011)
* 	modified:   erpnext/accounts/doctype/cost_center/cost_center.json

* fix: removed unique property from cost_center_name
2019-09-12 13:48:41 +05:30
sahil28297
b1604a24ed fix(add_to_cart): show add_to_card button only if specific conditions are satisfied (#19007) 2019-09-12 11:20:55 +05:30
Pranav Nachanekar
469247bf73 Change max date of datepicker
to number of days in future as specified by the settings
2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3 Add lead and calender event to appointments 2019-09-12 10:48:26 +05:30
Pranav Nachanekar
8051ca1859 Limit advance booking of appointments 2019-09-12 10:47:45 +05:30
Himanshu
e3ef56804c fix(Issue): track split from in issue (#18994)
* fix: track split from in issue

* fix: rename field name

* fix: remove first_mins to response
2019-09-11 19:20:20 +05:30
Fisher Yu
cd38ba4833 fix: several bugs and improvement ideas for education module #18599 (#18600)
* Update student_report_generation_tool.py

bug fix

* Update student_applicant.json

* Update program_course.json

* Update course_activity.json
2019-09-11 19:10:39 +05:30
Nabin Hait
1d1858a8b0 Show draft future payments as well 2019-09-11 18:39:49 +05:30
Pranav Nachanekar
249cdd92e0 Added uniqueness check for offset 2019-09-11 14:59:25 +05:30
Pranav Nachanekar
e543fc483f Removed email reminders
As it will be handled by calender event in the future
2019-09-11 14:59:13 +05:30
Pranav Nachanekar
a322b159ab Added back button from details page 2019-09-11 14:25:26 +05:30
Pranav Nachanekar
0cc837eac5 Create event for the appointment
TODO: Add lead and employee to this
2019-09-11 14:12:30 +05:30
Nabin Hait
ff09b412f4 feat: Allowed multiple payment requests against a reference document (#18988) 2019-09-11 12:43:27 +05:30
Pranav Nachnekar
4897897a3a Merge branch 'develop' into develop 2019-09-11 11:21:26 +05:30
Mangesh-Khairnar
7bcb24efbf fix(purchase-invoice): Update paid amount on creation of debit note (#18830)
* fix(purchase-invoice): set paid amount for purchase return

* fix(purchase-invoice): remove payment schedule on creation of debit note
2019-09-11 10:49:33 +05:30
Pranav Nachanekar
5038d6a6db Removed appointment tests
TODO: Write better tests after adding lead and calender event generation
2019-09-11 10:31:04 +05:30
rohitwaghchaure
bb736248a2 fix: incorrect qty calculation in the production plan fopr the sub assembely work orders (#18970) 2019-09-11 10:20:49 +05:30
Saurabh
e919388ee6 fix: do not cache value while creating item group, in setup wizard it will raise link validation error (#18992) 2019-09-11 10:07:50 +05:30
rohitwaghchaure
358a01a226 fix: Quotation Trends report not working for filter group by customer (#18989) 2019-09-10 19:18:30 +05:30
Pranav Nachanekar
2d7370a525 Moved delete_appointment 2019-09-10 16:46:17 +05:30
Rohan Bansal
bf7e012bde feat: add statuses for Serial No 2019-09-10 15:55:54 +05:30
Pranav Nachanekar
c4950a0281 Added doctype
availabitlity of slots added
2019-09-10 15:10:51 +05:30
Nabin Hait
a035428d43 fix: handling of key does not exists error 2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c Merge branch 'develop' into version-12 2019-09-10 14:38:39 +05:30
Sahil Khan
a2fd1f22da bumped to version 12.1.2 2019-09-10 14:58:39 +05:50
Sammish Thundiyil
bcda12f4bb modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json (#18829) 2019-09-10 14:11:02 +05:30
Shivam Mishra
e851346b4c fix: dont make dashboards if company is not set (#18975)
* fix: dont make dashboardss if company is not set

* fix: function call

* Update dashboard_charts.py
2019-09-10 14:08:31 +05:30
Nabin Hait
88e8688a4b fix: set raw material's batch based on main item's batch only if RM has batch no (#18977) 2019-09-10 14:07:45 +05:30
Suraj Shetty
0254217314 fix: Make address fields mandatory (#18979) 2019-09-10 14:07:05 +05:30
Mangesh-Khairnar
1853a83453 fix(packing-slip): add a descriptive message (#18981) 2019-09-10 13:21:01 +05:30
Pranav Nachanekar
6f486f3719 Addded status to appointment creation 2019-09-10 13:12:28 +05:30
Pranav Nachanekar
5c008ef023 UI Fixes
Only 8 time slots will appear in a row
Date is more readable on the contact details page
2019-09-10 13:12:07 +05:30
Pranav Nachanekar
5c211d8abf fixed codacy 2019-09-10 11:52:55 +05:30
Pranav Nachnekar
4ac25f28a3 Merge branch 'develop' into develop 2019-09-10 06:01:33 +00:00
rohitwaghchaure
d312d11062 fix: port from hotfix (#18974)
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
2019-09-10 10:47:36 +05:30
Deepesh Garg
69aeff15ef Merge pull request #18971 from Anurag810/sales_invoice_print_format_fixes_v13
fix: sales invoice return print format overriding the meta default print format
2019-09-09 18:35:05 +05:30
Pranav Nachanekar
06facea895 added doctype 2019-09-09 17:09:03 +05:30
Pranav Nachanekar
110f4ea0c9 Formatting 2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26 Removed unneccessary doctype 2019-09-09 17:01:40 +05:30
Pranav Nachanekar
20c7c290fa Formatting 2019-09-09 16:36:01 +05:30
Pranav Nachanekar
5945144c08 Added tests 2019-09-09 16:35:48 +05:30
Anurag Mishra
89d3bc0b54 fix: sales invoice return print format overideing the meta default print format 2019-09-09 15:58:25 +05:30
Pranav Nachanekar
10711dd09d Refactor UI 2019-09-09 15:41:20 +05:30
Pranav Nachanekar
63dbacd7c0 Disabled caching 2019-09-09 15:19:57 +05:30
Pranav Nachanekar
48e43e2421 build fix 2019-09-09 14:43:55 +05:30
Pranav Nachanekar
217aadba7e Better autoname 2019-09-09 14:43:41 +05:30
Mangesh-Khairnar
cbcede79b1 Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves
feat: Added input field for max carry forwarded leaves
2019-09-09 14:38:06 +05:30
Faris Ansari
32eccb8fb2 fix: Rename duplicate label Image to Website Image (#18912) 2019-09-09 14:29:01 +05:30
Nabin Hait
632fc6af79 feat: Added input field for max carry forwarded leaves 2019-09-09 13:33:00 +05:30
Suraj Shetty
f43825e4dd fix: convert dict to list for iteration (#18963) 2019-09-09 13:23:01 +05:30
Shivam Mishra
5f59c2ae75 fix: reload account timeline before creating dashboards (#18934)
* fix: sync account balance timeline.json before running patch

* fix: reload account timeline before creating dashboards
2019-09-09 13:20:53 +05:30
Mangesh-Khairnar
fd312be79f Merge pull request #18958 from surajshetty3416/employee-leave-balance-summary
feat: Employee Leave Balance Summary report
2019-09-09 13:18:41 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
Suraj Shetty
d2f22b52a5 Merge branch 'develop' into employee-leave-balance-summary 2019-09-09 10:21:06 +05:30
MorezMartin
ffc4f8f2a5 feat: [stock -> packed_items] Enable modification of Description on packed items (#18907)
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items
2019-09-09 10:16:23 +05:30
rohitwaghchaure
cdcff6c26d Multiple port from v11 hotfix (#18954)
* fix: circular dependency during asset cancellation

* fix: ImponibileImporto for On Previous Row Total

* fix: PrezzoUnitario decimal issue
2019-09-09 10:15:01 +05:30
Faris Ansari
e352fb754b fix: Reload doctype in variants patch (#18962) 2019-09-08 21:25:33 +05:30
Suraj Shetty
5ae40a9500 fix: Use absolute import instead of relative import
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-09-08 15:16:35 +05:30
Suraj Shetty
40dbb63042 Merge branch 'develop' into employee-leave-balance-summary 2019-09-08 14:15:47 +05:30
Faris Ansari
594918bd3a fix: Include Item variant patch in patches.txt (#18961) 2019-09-08 13:13:05 +05:30
Deepesh Garg
5343631708 Merge pull request #18960 from deepeshgarg007/gstr-1-remove-customer
fix: Minor fix in GSTR-1
2019-09-08 09:52:38 +05:30
deepeshgarg007
366451fc62 fix: Minor fix in GSTR-1 2019-09-08 09:51:15 +05:30
Suraj Shetty
a14ee7f1fe Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary 2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93 fix: Column value and data indentation 2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69 fix: Re-arrange filters 2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8 feat: Added default Leave Approver in Employee (#18953) 2019-09-07 12:31:07 +05:30
Saurabh
8e67a3a8a8 fix: check if 'All Item Group' exists before settings it as parent_item_group (#18956)
* fix: check if 'All Item Group' exists before settings it as parent_item_group

* feat: get cached value to avoid db call on each insert
2019-09-07 12:29:29 +05:30
Nabin Hait
4726fc4893 fix: Deleted unwanted production order files 2019-09-06 15:45:17 +05:30
Shivam Mishra
c69cc13c85 fix: updated footer message (#18949) 2019-09-06 15:40:15 +05:30
Prssanna Desai
ddfbb07c3b fix: fix accounts balance timeline dashboard chart source (#18942)
* fix: fix accounts balance timeline dashboard chart source

* fix: pass chart_name to get function instead of chart object
2019-09-06 15:38:06 +05:30
Nabin Hait
d30f87bbdf Merge branch 'Mangesh-Khairnar-feat-customer-credit-limit' into develop 2019-09-06 14:39:59 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Anurag Mishra
bbc1b5cdcf feat: added date filter based on billing date and based date (#18935) 2019-09-06 12:10:37 +05:30
Anurag Mishra
ac0c1edd23 feat: added date filter based on billing date and based date (#18936) 2019-09-06 12:10:10 +05:30
Marica
a93b665427 fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List (#18937)
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
2019-09-05 18:26:45 +05:30
Sahil Khan
ede7050afe Merge branch 'develop' into version-12 2019-09-05 17:30:44 +05:30
Sahil Khan
0906bc8430 bumped to version 12.1.1 2019-09-05 17:50:44 +05:50
Nabin Hait
ac2b5ed84f fix: credit limit patch 2019-09-05 16:57:26 +05:30
Nabin Hait
b847731482 Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit 2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d fix: Print/PDF of AR/AP report after refactoring (#18931) 2019-09-05 16:43:20 +05:30
Himanshu
6298da4458 fix: treeview fixes (#18803) 2019-09-05 16:12:33 +05:30
Deepesh Garg
cffe577028 fix: Add UOM in anlytics report when viewing based on item (#18902) 2019-09-05 16:03:15 +05:30
Raffael Meyer
48d1463825 fix(CoA): SKR04 (#18820)
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
-  move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5 Party accounts if don't have default company (#18771)
Add check for get_default company
2019-09-05 15:14:09 +05:30
Anurag Mishra
867ac10ffd fix: handle for product bundle (#18420)
* fix: handle for product bundle

* fix: Requested changes and some general fixes
2019-09-05 15:13:21 +05:30
KanchanChauhan
d114c8f88f fix(Purchase Order): Status updater (#18612) 2019-09-05 15:11:43 +05:30
Karthikeyan S
1d1427de60 fix(auto attendance): handling None case for IN/OUT Logs (#18867) 2019-09-05 15:02:33 +05:30
Andy Zhu
91596f2467 Change the field name for Payment Entry (#18874)
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'. 
Need to change the customer_dashboard file accordingly.
2019-09-05 15:01:38 +05:30
Nabin Hait
eb2ab3bf76 Merge branch 'develop' into develop 2019-09-05 14:59:16 +05:30
John Clarke
a7d448dcba fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913)
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445

This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?

User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?

See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
2019-09-05 14:55:35 +05:30
Rohan
77da3b4347 fix: pull project from task (#18776) 2019-09-05 14:53:43 +05:30
Rohan
9d77e9f719 fix: error while trying to get directions (#18827) 2019-09-05 14:51:22 +05:30
Govind S Menokee
c901d6322c fix(18837): Student creation error (#18838)
Academic user not able to create student
2019-09-05 14:50:23 +05:30
rohitwaghchaure
7496548c39 fix: not able to create invoice against patient (#18858) 2019-09-05 14:48:51 +05:30
rohitwaghchaure
f1fab871b8 fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879) 2019-09-05 14:47:43 +05:30
rohitwaghchaure
5aaf15d145 fix: healthcare practitioner not showing in the dropdown (#18929) 2019-09-05 14:42:28 +05:30
Nabin Hait
16a7ec95dc fix: tax category is optional argument 2019-09-05 13:01:15 +05:30
Suraj Shetty
607a21e02a feat: Init Employee Leave Balance Summary report 2019-09-05 12:42:29 +05:30
Nabin Hait
b03fa8a441 Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba Update customer.py 2019-09-05 12:33:29 +05:30
Nabin Hait
c78c86663d Update customer_credit_balance.py 2019-09-05 12:24:37 +05:30
Nabin Hait
7834a0182b Update move_credit_limit_to_customer_credit_limit.py 2019-09-05 12:22:48 +05:30
sahil28297
1e0b0da7ad fix(patch): add company in filters to get proper parent account (#18905) 2019-09-05 12:21:44 +05:30
Faris Ansari
a2db94761a fix: Honor Shopping Cart Price List (#18885) 2019-09-05 12:19:50 +05:30
rohitwaghchaure
805b8634da fix: incorrect stock value difference when stock move from negative to positive (#18887) 2019-09-05 12:18:33 +05:30
Rohan
1635967c4e fix: attribute error when trying to fetch items (#18900) 2019-09-05 12:16:49 +05:30
Nabin Hait
a5907e17d5 Update accounts_receivable.py 2019-09-04 11:04:27 +05:30
Suraj Shetty
0252c1478e Merge pull request #18917 from surajshetty3416/fix-call-popup
fix: Use medium instead of to number to get schedule
2019-09-04 11:04:14 +05:30
Suraj Shetty
f5bece1afa Merge branch 'develop' into fix-call-popup 2019-09-04 11:03:58 +05:30
Suraj Shetty
e46c56bfe8 fix: Use medium instead of to number to get schedule 2019-09-04 11:02:52 +05:30
Nabin Hait
561a2e966e Update accounts_receivable.py 2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working
fix: offline pos item search not working
2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659 fix: offline pos item search not working 2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1 feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647)
* feat: employee incentive and retention bonus added in additional salary

* fix: added salary component field, logic improved

* fix: codacy review
2019-09-03 20:45:52 +05:30
Sahil Khan
2691991d9a Merge branch 'develop' into version-12 2019-09-03 16:33:06 +05:30
Sahil Khan
e8b1c82531 bumped to version 12.1.0 2019-09-03 16:53:06 +05:50
Saurabh
67e4186360 Merge pull request #18909 from sahil28297/changelog_v12_1_0
fix(change_log): add v12_1_0 changelog
2019-09-03 16:26:07 +05:30
Saurabh
3f8f8d36b7 Merge branch 'develop' into changelog_v12_1_0 2019-09-03 16:25:44 +05:30
Sahil Khan
a70e2bdbc9 fix(change_log): add v12_1_0 changelog 2019-09-03 16:20:01 +05:30
Nabin Hait
1ab75db0ac refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501 Merge branch 'develop' into feat-customer-credit-limit 2019-09-03 14:20:17 +05:30
Mangesh-Khairnar
cb44f3a7c3 fix(purchase-invoice): add rounded total property setter for purchase invoice (#18841) 2019-09-03 14:18:15 +05:30
Deepesh Garg
c174e4d01a fix: Default message from Payment Gateway Account not fetching (#18848) 2019-09-03 14:17:41 +05:30
pranav nachnekar
d272fd42c9 changed Autoname 2019-09-03 14:16:56 +05:30
pranav nachnekar
c5b2a58669 Added submit fucntionality 2019-09-03 14:16:47 +05:30
Rohan
7fa3f3fe98 fix: include start and end date for contract status (#18866) 2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca A 2019-09-03 13:17:35 +05:30
pranav nachnekar
2791054327 Converted to an SPA 2019-09-03 12:04:52 +05:30
pranav nachnekar
eb4fa966b0 Added validation for timezones 2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690 Added guest permissions 2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7 Removed end time in favor of appointment duration 2019-09-03 12:03:14 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
Mangesh-Khairnar
cf901da25d test: create customer credit limit on change 2019-09-02 23:18:36 +05:30
Suraj Shetty
496f8e966f Merge pull request #18889 from deepeshgarg007/contacts-ref
fix: Travis
2019-09-02 18:32:28 +05:30
deepeshgarg007
4dd8895133 Merge branch 'contacts-ref' of https://github.com/deepeshgarg007/erpnext into contacts-ref 2019-09-02 17:42:27 +05:30
deepeshgarg007
8666ecc26f fix: Purchase receipt test 2019-09-02 17:41:12 +05:30
Suraj Shetty
152360d999 Merge branch 'develop' into contacts-ref 2019-09-02 16:24:57 +05:30
Mangesh-Khairnar
e7c7a0e648 fix: loan application (#18882)
* fix: loan application

* Update loan_application.py
2019-09-02 15:59:44 +05:30
Nabin Hait
4d553b7a84 Merge branch 'develop' into contacts-ref 2019-09-02 15:58:06 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675)
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
Suraj Shetty
063144c514 fix: Check in_patch before adding 'All Item Group' 2019-09-02 15:53:28 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd fix: remove references of mobile_no 2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657 fix: fix query for contacts 2019-09-02 13:20:27 +05:30
Suraj Shetty
f33dfc2121 Merge branch 'develop' into contacts-ref 2019-09-02 12:38:45 +05:30
Deepesh Garg
e26b55265f Merge pull request #18840 from netchampfaris/missing-parent-item-group
fix: Set default Parent Item Group
2019-09-02 12:22:49 +05:30
Himanshu Warekar
26dfd5b314 fix: translation strings 2019-09-02 12:21:41 +05:30
Himanshu Warekar
e31c6964f3 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-09-02 12:11:15 +05:30
Himanshu Warekar
fd85b1689d fix: review fixes 2019-09-02 12:10:15 +05:30
Suraj Shetty
4a8710ef75 Merge pull request #18611 from surajshetty3416/fix-paid-amount
fix: Paid amount 0 while creating advanced payment entry
2019-09-02 08:38:34 +05:30
Suraj Shetty
58e6b67886 Merge pull request #18613 from surajshetty3416/fix-timesheet-creation
fix(timesheet): Hours automatically used to set 0
2019-09-02 08:38:12 +05:30
Suraj Shetty
f268562256 Merge branch 'develop' into contacts-ref 2019-09-02 06:32:11 +05:30
Mangesh-Khairnar
86720deeae fix: bypass credit limit check 2019-09-01 10:15:23 +05:30
Suraj Shetty
ae587dbd83 Merge pull request #18524 from surajshetty3416/feature-pick-list
feat: Pick List
2019-08-31 19:44:45 +05:30
Suraj Shetty
72bea0dff4 test: Add test to check creation of pick list from multiple sales order 2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc fix: Maintain the order of Item List 2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552 test: Enable basic tests 2019-08-31 16:58:51 +05:30
Mangesh-Khairnar
bb3cec1556 test: fetch data from customer credit limit 2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
42d0da8f5a Revert "fix: process allocation expiry"
This reverts commit b654dc0e28.
2019-08-31 14:28:10 +05:30
Mangesh-Khairnar
dbc69da409 fix: minor fixes 2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868 fix: check column in credit limit 2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559 fix: fetch customer group of the customer 2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea fix: get credit limit 2019-08-30 22:57:51 +05:30
Suraj Shetty
bcfec77e2c style: Use single quotes 2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233 fix: Commonify item not available alert
- Reorganise code
- UX fixes
2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe test: Temporarily comment out tests 2019-08-30 19:12:16 +05:30
Mangesh-Khairnar
b3e5d11e1d fix: multiple fixes 2019-08-30 18:18:48 +05:30
Suraj Shetty
0df38891a1 fix: Update pick list print format 2019-08-30 15:59:35 +05:30
Suraj Shetty
f75481fa23 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-30 15:45:18 +05:30
pranav nachnekar
828fea6d66 formatting and date validation 2019-08-30 10:49:57 +05:30
pranav nachnekar
2cd994977b Better date validation 2019-08-30 10:49:43 +05:30
pranav nachnekar
17906d5599 Added polyfill for datepicker
for Safari and IE  support
2019-08-30 10:49:07 +05:30
Suraj Shetty
5e84ce55ae fix: Add is_stock_item filter for item in locations table 2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae fix: Set default value for qty 2019-08-30 09:52:08 +05:30
Suraj Shetty
88885184dc fix: Show separate button for pick list creation in work order 2019-08-30 09:30:18 +05:30
Suraj Shetty
9641edc562 fix: Set item locations before save 2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575 fix: Check parent warehouse for batch as well 2019-08-29 21:14:26 +05:30
Mangesh-Khairnar
dcd5be0d07 patch: move credit limit in customer to child table 2019-08-29 20:53:51 +05:30
Mangesh-Khairnar
c059bc3e36 fix: grid view of customer credit limit 2019-08-29 20:51:31 +05:30
Deepesh Garg
52c61904c8 Merge pull request #18870 from rohitwaghchaure/not_able_to_save_sales_order_develop
fix: not able to save sales order
2019-08-29 20:32:06 +05:30
Suraj Shetty
a6ab00162e style: Remove commented code 2019-08-29 20:17:04 +05:30
Suraj Shetty
9e4282e130 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 20:09:55 +05:30
Rohit Waghchaure
13c7e183a6 fix: not able to save sales order 2019-08-29 20:03:52 +05:30
Mangesh-Khairnar
5755d2d32f fix: customer credit limit report 2019-08-29 19:51:38 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Suraj Shetty
3e11338ed5 fix: Validate count of serial numbers 2019-08-29 19:46:49 +05:30
Mangesh-Khairnar
233ee277ef Merge pull request #18853 from Mangesh-Khairnar/fix-allocation-expiry
fix: process allocation expiry
2019-08-29 18:29:07 +05:30
Mangesh-Khairnar
36b30911a8 feat: customer credit limit 2019-08-29 18:06:23 +05:30
Suraj Shetty
acd00df8fb Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 17:24:23 +05:30
Suraj Shetty
ed1ec82d2f refactor: Item picking logic
- Fix serial number selection
- Get limited item location based on required qty
- Store total item count to properly track available locations
- Pass missing serial no.
2019-08-29 17:23:09 +05:30
pranav nachnekar
25052a0ab7 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-08-29 16:56:54 +05:30
pranav nachnekar
dbd72ea89d Added time generation 2019-08-29 16:56:19 +05:30
Mangesh-Khairnar
232b5dab81 Merge pull request #18854 from ruchamahabal/fixes
fix: exception in Shopify Settings
2019-08-29 16:33:46 +05:30
Deepesh Garg
dbe8dab3ce Merge pull request #18794 from deepeshgarg007/supplier_items
fix: Enhancement in Purchase Order
2019-08-29 16:29:02 +05:30
Rucha Mahabal
f5b2db76cb Merge branch 'develop' into fixes 2019-08-29 13:32:30 +05:30
Suraj Shetty
1c29c520bd Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 13:18:57 +05:30
Mangesh-Khairnar
2f322609d7 Merge pull request #18852 from mbhavesh95863/patch-1
fix(selling): remove redundant listing
2019-08-29 13:12:38 +05:30
Mangesh-Khairnar
74c7b04b29 Merge branch 'develop' into fixes 2019-08-29 12:31:38 +05:30
rohitwaghchaure
c20e66e0be Merge pull request #18860 from rohitwaghchaure/added_purchase_invoice_in_buying_module
fix: added purchase invoice in buying module
2019-08-29 12:13:50 +05:30
rohitwaghchaure
445a93e5f5 Merge pull request #18859 from rohitwaghchaure/incorrect_valuation_rate_calculated_for_serial_no_develop
fix: incorrect valuation rate calculated because of string replacement
2019-08-29 12:13:02 +05:30
Suraj Shetty
66f2bc69a6 fix: Item mapping of stock entry with no reference 2019-08-29 09:23:31 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Rohit Waghchaure
354d0af44e fix: added purchase invoice in buying module 2019-08-28 17:51:31 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Mangesh-Khairnar
b654dc0e28 fix: process allocation expiry 2019-08-28 17:22:56 +05:30
Rohit Waghchaure
d03d8204ab fix: incorrect valuation rate calculated because of string replacement issue 2019-08-28 17:22:50 +05:30
pranav nachnekar
adba6c833d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-08-28 17:00:27 +05:30
pranav nachnekar
7b9e30914f Added doctypes and portal pages 2019-08-28 16:57:37 +05:30
Rucha Mahabal
1707c3da95 fix: exception
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
2019-08-28 13:55:26 +05:30
Rucha Mahabal
b606d4d2ad Merge branch 'develop' into fixes 2019-08-28 13:50:31 +05:30
Rucha Mahabal
9fa5dbd6e4 fix: raised exception in shopify 2019-08-28 13:29:03 +05:30
Suraj Shetty
1cf7270049 fix: Add picklist dashboard config 2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
2019-08-28 12:40:26 +05:30
Shivam Mishra
0aeccbf4b2 feat: added dashboard fixtures (#18812)
* feat: add dashboard charts fixture

* fix: remove return statement

* feat: added patch for creating default dashboards

* chore: renamed dashboard charts

* feat: add add_dashboard function to install fixtures

* fix: reload doctype issue in patches

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard doctype

* fix (travis): reloaded dashboard chart link doctype
2019-08-28 11:39:45 +05:30
Suraj Shetty
8f32ac0edd fix: Batch selection logic 2019-08-28 10:16:20 +05:30
Himanshu Warekar
a5b78f3c0d fix: get address in single line 2019-08-28 00:04:05 +05:30
Mangesh-Khairnar
671c20ec56 Merge branch 'develop' into patch-1 2019-08-27 22:42:35 +05:30
Mangesh-Khairnar
17d3de1821 fix: process allocation expiry 2019-08-27 22:37:12 +05:30
mbhavesh95863
cfec328c74 Same report 2 times in list 2019-08-27 19:17:19 +05:30
Suraj Shetty
c5e0838890 fix: Import get_conversion factor method 2019-08-27 12:14:17 +05:30
Suraj Shetty
974ac3e6ad fix: Update item detail for items without reference 2019-08-27 10:17:16 +05:30
Suraj Shetty
dc675b1eb0 fix: Re-order stock qty field 2019-08-27 08:06:22 +05:30
Himanshu Warekar
9057239c3c fix: display address 2019-08-26 22:40:54 +05:30
Suraj Shetty
d6be8989e4 fix: Remove "Material Issue" purpose from pick list
- Because in material issue we already define source warehouse
2019-08-26 22:11:49 +05:30
Faris Ansari
8ac2a2f0c4 fix: Set default Parent Item Group 2019-08-26 13:00:17 +05:30
Himanshu Warekar
1c538b9b43 Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref 2019-08-26 12:51:51 +05:30
Himanshu Warekar
ba6fe6cde5 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-08-26 12:49:45 +05:30
Himanshu Warekar
7243e774c2 fix: add city, state and country 2019-08-26 12:49:20 +05:30
Shivam Mishra
db3bb793e9 feat: added domain info on footer (#18839) 2019-08-26 11:29:18 +05:30
Suraj Shetty
8de8a78235 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-26 10:51:12 +05:30
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Suraj Shetty
00f9930fbf style: Remove leftout print statements 2019-08-26 10:09:07 +05:30
Suraj Shetty
457da47dba fix: set for_qty instead of pick_list 2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
a1aa85712b Merge branch 'develop' into fix-timesheet-creation 2019-08-26 10:01:45 +05:30
Suraj Shetty
05f243590d fix: Show option to create pick list or work order 2019-08-26 09:29:31 +05:30
Suraj Shetty
94d7096c8c fix: Show create button only if target doc does not exists 2019-08-26 08:40:02 +05:30
Suraj Shetty
ecc801d3d8 fix: Add pick list field to delivery note 2019-08-26 08:39:11 +05:30
Suraj Shetty
be9f4ea487 fix: Add button to create pick list from material request 2019-08-26 08:38:37 +05:30
Suraj Shetty
a1dc152695 fix: Move get items location button below items table 2019-08-26 06:57:43 +05:30
Suraj Shetty
9209570937 feat: Add option to create pick list from material request 2019-08-26 06:33:27 +05:30
Nabin Hait
d8c262fd5c fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd fix: show a descriptive message on submission of duplicate account (#18486)
* fix: show a descriptive message on submission of duplicate account

* Update account.py
2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Deepesh Garg
98b86ecbc2 Merge branch 'develop' into supplier_items 2019-08-23 15:41:30 +05:30
Himanshu
dc0fb08ec7 Merge branch 'develop' into contacts-ref 2019-08-23 15:03:03 +05:30
Tufan Kaynak
a7ab51c5ba Update vehicle_expenses.py (#18768) 2019-08-23 12:50:52 +05:30
deepeshgarg007
59432418c6 fix: Consider multiple stock entry against a purchase order 2019-08-23 12:45:48 +05:30
Nabin Hait
6e7b9b5cb7 Update sales_invoice.py 2019-08-23 12:27:05 +05:30
Suraj Shetty
8b4d604cfd fix: Use purpose field and remove item_base_on field 2019-08-23 11:57:16 +05:30
Suraj Shetty
4affe4b939 Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:51:59 +05:30
Michelle Alva
c890401fec fix: added payroll period in HR module (#18543) 2019-08-23 11:50:48 +05:30
Suraj Shetty
7f94a58bf1 Merge branch 'develop' into fix-timesheet-creation 2019-08-23 11:46:01 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660)
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
2019-08-23 11:42:35 +05:30
KanchanChauhan
23b5f4ec99 fix: Leave Application status filter (#18770)
When we click on Status Open in list view it throws an error.


After fix, it filters the results on Open status
2019-08-23 11:40:09 +05:30
Nabin Hait
bdfd69a2fe Merge branch 'develop' into contacts-ref 2019-08-23 11:34:42 +05:30
Harshit
56d03a456b fix: add contract to CRM module (#18817) 2019-08-23 11:34:25 +05:30
Michelle Alva
680e098b87 fix(dash): Added Tax exemption category and sub category in Employee Tax and Benefits (#18545)
section
2019-08-23 11:32:43 +05:30
Anurag Mishra
db88476f8b feat: refactor invoice_discounting (#18629)
* feat: refactor invoice_discountig

* Update invoice_discounting.py

* Update invoice_discounting.js
2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe fix: POS Sync Issue (#18807) 2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a Merge branch 'develop' into fix-paid-amount 2019-08-23 10:42:23 +05:30
deepeshgarg007
f2798eab50 fix: Conside multiple stock entry against a purchase order 2019-08-23 10:07:52 +05:30
Anurag Mishra
210317c0b5 fix: division by zero in asset Depereciation (#18637)
* fix: division by zero in asset Depereciation

* fix: requested changes
2019-08-23 00:21:26 +05:30
Himanshu Warekar
362c89ca73 Merge branch 'develop' of https://github.com/frappe/erpnext into contacts-ref 2019-08-22 17:29:38 +05:30
Suraj Shetty
687b1a5b1f fix: Make pick list submittable and add few fields
- Add material request & item fields
- Add pick_list field to Stock Entry
- Add purpose field to pick list
2019-08-22 16:41:14 +05:30
Suraj Shetty
8d55f81baa fix: Fix raw matterial selection based on finished item qty 2019-08-22 16:37:44 +05:30
Sahil Khan
7ff82fccf3 Merge branch 'develop' into version-12 2019-08-22 13:10:17 +05:30
Sahil Khan
cd25d6dc7f bumped to version 12.0.8 2019-08-22 13:30:17 +05:50
Suraj Shetty
c1f25ff9e3 fix: Add option to select qty of finished goods Item 2019-08-22 09:53:44 +05:30
Himanshu Warekar
447134d308 Merge develop into contacts-ref 2019-08-22 09:21:30 +05:30
rohitwaghchaure
224d857928 Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop
fix: reconciled entry has not clearance date set
2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop
fix: debit note not reconciled with another purchase invoice using pa…
2019-08-21 23:35:35 +05:30
Suraj Shetty
ec92486377 fix: Add option to create Stock Entry from Pick List 2019-08-21 22:10:27 +05:30
Anastes Mp
a6c6e02c49 Incorrect database table (#18558)
Fixed Unknow Column tax_type error on offline pos
2019-08-21 16:53:06 +05:30
Suraj Shetty
298d38cde3 test: Fix existing tests 2019-08-21 16:37:49 +05:30
Himanshu Warekar
81f20891c1 fix: query 2019-08-21 16:09:35 +05:30
Suraj Shetty
109a07b834 fix: Fix get_employees_with_number query
if the passed number is 7039392929 then it should match 
with the employee cell_number set as `7039392929, 0288382222`
2019-08-21 15:19:08 +05:30
Mangesh-Khairnar
5619db28cb fix: fetch capital work in progress as expense account (#18780) 2019-08-21 14:49:24 +05:30
Nabin Hait
bcb0f6038e fix: Single gl entry should only be considered once either in opening or closing entry (#18792) 2019-08-21 14:47:33 +05:30
Deepesh Garg
e9e0c0e7d4 fix: Minor fix in GSTR-1 report (#18797) 2019-08-21 14:40:35 +05:30
Suraj Shetty
e84de50147 fix: check if number exists after striping '0' (#18805)
fix: check if number exists after striping '0'
2019-08-21 14:22:59 +05:30
Himanshu Warekar
c6e02e2a74 fix: make contact structure call popup compatible 2019-08-21 13:36:41 +05:30
Himanshu Warekar
ea97a6cb5b Merge develop into contacts-ref 2019-08-21 13:19:22 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
6affeaa9c1 fix: check if number exists after striping '0'
- Absract number striping logic to separate method
- Rename a confusing variable name
- Remove leftout print statement
2019-08-21 09:14:56 +05:30
Suraj Shetty
d79a16c9f3 fix: Warehouse selection login
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-21 09:03:26 +05:30
rohitwaghchaure
d36ff39498 Merge pull request #18799 from scmmishra/cart-fix
fix: shopping cart item availability
2019-08-21 08:58:47 +05:30
Himanshu Warekar
9f4dc3fcd4 fix: call popup get contact name from number 2019-08-20 22:20:02 +05:30
Himanshu Warekar
128f5dbff1 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into contacts-ref 2019-08-20 20:38:18 +05:30
Mangesh-Khairnar
576f51d89e Merge pull request #18791 from Mangesh-Khairnar/fix-ledger-entry
fix: ledger entries
2019-08-20 19:57:50 +05:30
Shivam Mishra
eab5be1110 fix: shopping cart item availability 2019-08-20 19:31:54 +05:30
Mangesh-Khairnar
c9b6c9bb61 fix: calculate opening leave balance 2019-08-20 19:18:45 +05:30
Mangesh-Khairnar
6d549b03f1 Merge branch 'develop' into fix-ledger-entry 2019-08-20 17:58:44 +05:30
Saurabh
128db172f0 Merge pull request #18796 from sahil28297/merge_v12_hotfix_1
Merge version-12-hotfix into develop
2019-08-20 17:49:24 +05:30
Suraj Shetty
dd63b656c7 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 16:59:43 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
deepeshgarg007
9e6abc4948 fix: Test case fixes 2019-08-20 16:14:44 +05:30
Sahil Khan
bf2b712f4b Merge branch 'version-12-hotfix' into version-12 2019-08-20 16:00:26 +05:30
Sahil Khan
a8403cde16 bumped to version 12.0.7 2019-08-20 16:20:26 +05:50
deepeshgarg007
cb38cc96c3 fix: Enhancement in Purchase Order 2019-08-20 15:00:48 +05:30
Mangesh-Khairnar
79414a8d36 fix: fetch employee name on leave ledger creation 2019-08-20 14:45:57 +05:30
Mangesh-Khairnar
5cdda19494 fix: ledger entries after expiry 2019-08-20 14:45:57 +05:30
rohitwaghchaure
16dda1a991 fix: group by voucher consolidated showing incorrect data for deferred entries (#18779) 2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf fix: group by voucher consolidated showing incorrect data for deferred entries (#18777) 2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
b69595904a Merge pull request #18786 from Mangesh-Khairnar/payment-order-fetch-fix
fix: restrict the payment order to non received type payment entries
2019-08-20 12:21:24 +05:30
Suraj Shetty
5124b2806d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 12:05:51 +05:30
Suraj Shetty
060ff62178 Merge branch 'feature-pick-list' of github.com:surajshetty3416/erpnext into feature-pick-list 2019-08-20 12:04:11 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-20 12:04:07 +05:30
Suraj Shetty
a251267dd7 fix: Quantity while creating pick list from work order
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order
2019-08-20 12:03:03 +05:30
rohitwaghchaure
9ef7d5edaf Merge pull request #18789 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_develop
Asset pro rata cal for wdv remaining amt develop
2019-08-20 10:33:15 +05:30
Rohit Waghchaure
5d3dee206f fixed test cases and the logic for pro rata calculation 2019-08-20 10:30:56 +05:30
Rohit Waghchaure
1583925080 fix: Pro rata calculation is not working for WDV depreciation method 2019-08-20 10:30:38 +05:30
Mangesh-Khairnar
c97a7fb845 fix: restrict the payment order to non received type payment entries 2019-08-20 00:27:43 +05:30
Mangesh-Khairnar
becb89213f Merge pull request #18737 from Mangesh-Khairnar/fix-payment-order
fix: restrict the payment order to non received type payment entries
2019-08-20 00:13:32 +05:30
Rohit Waghchaure
1008e6e450 fix: debit note not reconciled with another purchase invoice using payment reconciliation 2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
09ddc84c3a Merge pull request #18774 from deepeshgarg007/test_case_fix
fix: Failing sales and purchase return test cases
2019-08-19 19:20:52 +05:30
Deepesh Garg
33b392ac2b Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:43:10 +05:30
Deepesh Garg
3965451c7a Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:40:29 +05:30
deepeshgarg007
0487ad5515 fix: Code cleanup 2019-08-19 16:40:29 +05:30
deepeshgarg007
e2acc748c8 fix: Check for return against delivery noteas well 2019-08-19 16:38:04 +05:30
Mangesh-Khairnar
4645727163 Merge branch 'develop' into fix-payment-order 2019-08-19 16:29:30 +05:30
deepeshgarg007
7d288437d8 fix: Assignment 2019-08-19 16:19:48 +05:30
deepeshgarg007
c80e5fe7a1 fix: Failing sales and purchase return test cases 2019-08-19 14:38:15 +05:30
Deepesh Garg
5efedd7a60 fix: Travis (#18772) 2019-08-19 12:56:22 +05:30
Deepesh Garg
960a1cbd8f fix: Party dashboard heatmap not capturing sales, purchase and other activities (#18753) 2019-08-19 11:51:16 +05:30
Suraj Shetty
6450be5e58 fix: Get Items button 2019-08-19 10:48:21 +05:30
Suraj Shetty
669cff88d1 fix: Get items button 2019-08-19 10:38:01 +05:30
Anurag Mishra
19c3cb0d5b fix: removed filters(not required) (#18729) 2019-08-19 10:31:02 +05:30
Anurag Mishra
bc5712a1b3 fix: validated cost center in financial_statement (#18733)
* fix: validated cost center in financial_statement

* Update financial_statements.py
2019-08-19 10:24:44 +05:30
Mangesh-Khairnar
0df513434e fix: valuation rate in stock ledger (#18744)
* fix: valuation rate in stock ledger

* test: allow zero valuation rate for items
2019-08-19 10:04:52 +05:30
Karthikeyan S
d5e5e22adb Merge pull request #18523 from Vigneshsekar/attendance_grace_period
feat(Auto Attendance): Add grace period
2019-08-18 13:25:48 +05:30
Deepesh Garg
77ec3cf402 Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
fix: Default dimensions in child doctypes
2019-08-16 17:27:14 +05:30
deepeshgarg007
0a2ed6da37 fix: Add missing semicolon 2019-08-16 15:50:17 +05:30
Deepesh Garg
6e80cbfd1e Merge pull request #18761 from deepeshgarg007/symbol_fix_develop
fix: Symbol fix in chart of accounts
2019-08-16 15:48:17 +05:30
Faris Ansari
ac3579d2c6 Merge pull request #17624 from Mangesh-Khairnar/leave-management
feat: Carry Forward Leave Expiry
2019-08-16 15:39:24 +05:30
deepeshgarg007
8d0b6f9a60 fix: Handling if no default dimension exists 2019-08-16 14:00:26 +05:30
deepeshgarg007
42d9298318 fix: Remove extra space 2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f Merge branch 'develop' into fix-payment-order 2019-08-16 12:42:26 +05:30
Suraj Shetty
ec1fe9e2ca Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-16 08:17:26 +05:30
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-16 08:16:22 +05:30
deepeshgarg007
2fb6bc9867 fix: Default dimensions in child doctypes 2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
fix: sequence of customer name and contact in the AR report
2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f fix: sequence of customer name and contact in the AR report 2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950 fix: restrict the payment order to non received type payment entries 2019-08-14 17:38:44 +05:30
Mangesh-Khairnar
ae2a0fb4c7 chore: remove unused code 2019-08-14 16:50:31 +05:30
Mangesh-Khairnar
2e1d7cbdc2 Merge pull request #18736 from Mangesh-Khairnar/fix-travis
fix: travis
2019-08-14 16:33:34 +05:30
Mangesh-Khairnar
ca55af836b fix: travis 2019-08-14 16:32:02 +05:30
Mangesh-Khairnar
3a42631e65 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-14 16:11:08 +05:30
Mangesh-Khairnar
107b2768fd refactor: replace raw sql with orm 2019-08-14 16:09:16 +05:30
Anurag Mishra
78690d7b8b fix:payment ammount validation for pos invoices (#18663) 2019-08-14 15:03:58 +05:30
Mangesh-Khairnar
760b078dc9 fix(payroll-entry): commit submitted salary slip check on change (#18694)
* fix(payroll-entry): commit submitted salary slip check onchange

* fix: track submitted ss via flags
2019-08-14 14:40:00 +05:30
Deepesh Garg
2c5dcbe819 fix: Error handling in payment entry (#18720) 2019-08-14 14:26:37 +05:30
Mangesh-Khairnar
06ce1f5a40 fix(quality-inspection): fetch all items for inspection type in process (#18716)
* fix(quality-inspection): fetch all items for inspection type in process

* fix(quality-inspection): add server side validation for in process items
2019-08-14 14:25:59 +05:30
Vignesh S
4454630549 feat(Auto Attendance): Add grace period
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
2019-08-14 13:40:02 +05:30
Deepesh Garg
612b0ff9cd Merge pull request #18719 from Anurag810/company_fix_v13
fix: removed hard coded string
2019-08-14 12:12:26 +05:30
Deepesh Garg
5a7f26f4d2 Merge pull request #18717 from Anurag810/company_fix
fix: removed hard coded string form company
2019-08-14 12:11:33 +05:30
Anurag Mishra
de20b083a0 Merge branch 'develop' into company_fix_v13 2019-08-14 12:10:02 +05:30
Raffael Meyer
17166a5662 fix typo 2019-08-14 01:22:29 +02:00
Raffael Meyer
e6013fb02d improve error messages 2019-08-14 01:15:23 +02:00
Raffael Meyer
c29f594fc1 Check existance of DATEV Settings 2019-08-14 00:39:59 +02:00
Raffael Meyer
5fe44f906d Add fiscal year 2019-08-14 00:31:00 +02:00
Raffael Meyer
df4edaa0fd Use values from DATEV Settings 2019-08-14 00:13:31 +02:00
alyf-de
02522a0df5 Add DATEV Settings 2019-08-14 00:06:21 +02:00
Raffael Meyer
e4e7468972 Merge branch 'develop' into datev_report_headers 2019-08-13 23:17:28 +02:00
Anurag Mishra
904cbef4dc fix: removed hard coded string 2019-08-13 19:48:42 +05:30
Anurag Mishra
81d5265385 fix: removed hard coded string 2019-08-13 19:40:36 +05:30
Sagar Vora
33d00bfeae fix: v12 patches sequence (#18610) 2019-08-13 19:39:48 +05:30
rohitwaghchaure
4d7a0aaee1 Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
fix: Check if account passed is accessible under Payment Entry
2019-08-13 18:37:17 +05:30
Sagar Vora
e14a00b887 fix: v12 patches sequence (#18609) 2019-08-13 17:26:56 +05:30
Sahil Khan
77ec5cc8d5 Merge branch 'version-12-hotfix' into version-12 2019-08-13 14:44:18 +05:30
Sahil Khan
f841afd48d bumped to version 12.0.6 2019-08-13 15:04:18 +05:50
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
Mangesh-Khairnar
8b9b77959d fix: fetch min date when carry forward expiry is greater than leave allocation expiry 2019-08-13 13:20:10 +05:30
Anurag Mishra
d2f13fe0a6 fix: query (#18709) 2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38 Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission 2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97 fix: Re-organise code 2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea fix: Ignore account permission check 2019-08-13 12:09:06 +05:30
Himanshu
7df50b6ec7 fix(QMS): TreeView fixes (#18595)
* fix: TreeView fixes

* test: test case fix
2019-08-13 11:58:42 +05:30
Suraj Shetty
80afee04a4 fix: Set address while creating Opportunity from Lead (#18702)
* fix: Set address while creating Opportunity from Lead

* fix: Setting of address in opportunity from Lead
2019-08-13 10:58:29 +05:30
Suraj Shetty
bd2e7c0e53 fix: Comment description 2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299 fix: Check if account passed is accessible under Payment Entry 2019-08-12 16:18:36 +05:30
Faris Ansari
9002a6c195 Merge pull request #18353 from surajshetty3416/refactor-call-popup
fix(call popup): Multiple changes
2019-08-12 15:56:59 +05:30
Faris Ansari
9eda500dbc Merge branch 'develop' into refactor-call-popup 2019-08-12 15:56:35 +05:30
Rohit Waghchaure
fb23773935 fix: reconciled entry has not clearance date set 2019-08-12 15:35:19 +05:30
Frappe PR Bot
037caf096b feat: Updated translation (#18597) 2019-08-12 15:32:37 +05:30
Suraj Shetty
f81b6c7cfb fix: Set address while creating Opportunity from Lead (#18700) 2019-08-12 13:05:22 +05:30
DeeMysterio
1c728a7cf8 fix(delivery note): change the text invoice to sales invoice on make button (#18658) 2019-08-12 13:04:25 +05:30
DeeMysterio
cfce53103b fix(delivery note): change the text invoice to sales invoice on make button (#18666) 2019-08-12 13:03:55 +05:30
Michelle Alva
af969d664f Added Employee Tax Exxxemption category and sub-category links (#18659) 2019-08-12 12:59:59 +05:30
Himanshu
19199baf29 fix: miscellaneous fixes (#18615) 2019-08-12 12:17:28 +05:30
Himanshu
ebf38c5ebd fix: misc fixes (#18616) 2019-08-12 12:17:16 +05:30
Andrew McLeod
c97ffaeac3 fix: Python3 urllib use in item_group.py (now uses six.moves) (#18643) 2019-08-12 12:06:30 +05:30
Andrew McLeod
677c522f01 fix: Python3 urllib use in item_group.py (now uses six.moves) (#18642) 2019-08-12 12:06:23 +05:30
Shivam Mishra
8363a6e585 refactor: remove from date and to date from standard filter (#18696) 2019-08-12 11:58:14 +05:30
Suraj Shetty
83705af0b3 fix: Filters for portal quotation list (#18689)
* fix: Filters for portal quotation list

* fix: Remove unwanted import
2019-08-12 11:51:27 +05:30
sahil28297
214815eb62 fix(patch): force reload child docs (#18672) 2019-08-12 11:49:21 +05:30
sahil28297
a0b9b3cef5 fix(patch): force reload child docs (#18671) 2019-08-12 11:49:14 +05:30
Deepesh Garg
cd7a89da32 Merge pull request #18691 from deepeshgarg007/gstr-3b-non-gst-v12
fix: GSTR 3B report fixes
2019-08-11 19:50:44 +05:30
Deepesh Garg
43dc351209 Merge pull request #18692 from deepeshgarg007/gstr-3b-non-gst-develop
fix: GSTR 3B report fixes
2019-08-11 19:50:29 +05:30
deepeshgarg007
9db6471fae fix: Test Case 2019-08-11 17:29:09 +05:30
deepeshgarg007
4b28b3216b fix: Test Cases 2019-08-11 17:28:55 +05:30
deepeshgarg007
db01743885 fix: Test Case 2019-08-11 15:47:35 +05:30
deepeshgarg007
b87c5d83de fix: Test Cases 2019-08-11 12:40:45 +05:30
Deepesh Garg
8f706399a0 Merge pull request #18631 from netchampfaris/fix-item-template-description
fix(Item Template): Fallback description string
2019-08-11 11:20:46 +05:30
deepeshgarg007
c36abbcda3 fix: GSTR 3B report fixes 2019-08-11 11:01:02 +05:30
deepeshgarg007
dabcb6b531 fix: GSTR 3B report fixes 2019-08-11 10:58:16 +05:30
Deepesh Garg
1fb21cd9e5 Merge branch 'version-12-hotfix' into fix-item-template-description 2019-08-10 17:36:00 +05:30
Deepesh Garg
e6b076cb34 Merge pull request #18632 from netchampfaris/fix-item-template-description-fp
fix(Item Template): Fallback description string
2019-08-10 17:33:59 +05:30
Deepesh Garg
7f0f0d0559 Merge pull request #18685 from marination/fixes_v12_hotfix
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:27:45 +05:30
Deepesh Garg
0b711d1f8a Merge pull request #18684 from marination/fixes_v12
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:26:54 +05:30
Suraj Shetty
3f7a757e80 Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-09 19:23:09 +05:30
Suraj Shetty
d4edd284e6 fix: Set Contact or Lead for call log
- Set contact or lead to call log on new Contact or Lead creation
2019-08-09 19:23:04 +05:30
Suraj Shetty
b282f1f154 Merge branch 'develop' into refactor-call-popup 2019-08-09 18:18:17 +05:30
Himanshu Warekar
3fbfac64c2 Merge contacts-ref into contacts-ref 2019-08-09 17:51:14 +05:30
Himanshu Warekar
12fbecf48b fix: use primary label instead of bold letters 2019-08-09 17:50:03 +05:30
Himanshu
59a6821299 Merge branch 'version-12-hotfix' into contacts-ref 2019-08-09 16:52:39 +05:30
marination
9839a9afb0 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:54:18 +05:30
marination
4583100537 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:30:05 +05:30
Deepesh Garg
ca5fdeb9bb Merge pull request #18683 from Mangesh-Khairnar/fix-translation-test
test: Translation in search
2019-08-09 15:29:33 +05:30
rohitwaghchaure
5790fabd54 Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12
fix: allow to subcontract service raw materials
2019-08-09 15:18:38 +05:30
rohitwaghchaure
208eb05519 Merge pull request #18682 from Anurag810/get-item-from-product-bundle-v13
fix: get item from product bundle
2019-08-09 15:18:15 +05:30
rohitwaghchaure
ed6fb66a90 Merge pull request #18679 from Anurag810/get-item-from-product-bundle
fix: get item from product bundle
2019-08-09 15:17:42 +05:30
Mangesh-Khairnar
7c7e9ecfcd test: translation fix 2019-08-09 14:48:36 +05:30
Anurag Mishra
8d4b04e719 fix: get item from product bundle 2019-08-09 14:34:09 +05:30
Mangesh-Khairnar
e173d54054 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-09 13:37:51 +05:30
Anurag Mishra
24c3b4e00f fix: get item from product bundle 2019-08-09 13:27:59 +05:30
Mangesh-Khairnar
261d132f3a fix: calculate earned leaves based on annual allocation 2019-08-09 13:18:52 +05:30
Himanshu
fa3af74179 Merge pull request #18596 from hrwX/qms-fixes
fix(QMS): TreeView fixes
2019-08-09 11:53:23 +05:30
Himanshu
0184c981ee Merge branch 'version-12-hotfix' into contacts-ref 2019-08-09 11:15:28 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Himanshu
ffddcb0526 Merge branch 'version-12-hotfix' into qms-fixes 2019-08-09 11:06:36 +05:30
Himanshu Warekar
86f3310ac1 fix: iterate over valid variable 2019-08-09 11:05:04 +05:30
Himanshu Warekar
f94d183297 feat: move to newer contacts structure 2019-08-08 23:50:03 +05:30
Himanshu Warekar
224c2ddaf4 feat: render multiple addresses 2019-08-08 23:34:34 +05:30
Mangesh-Khairnar
3662ed50d2 fix: multiple changes 2019-08-08 19:47:17 +05:30
Suraj Shetty
7e818067eb Merge branch 'develop' into refactor-call-popup 2019-08-08 19:18:03 +05:30
Suraj Shetty
44b906a43d Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-08 19:16:37 +05:30
Suraj Shetty
429bfcfd83 fix: Make requested changes 2019-08-08 19:16:32 +05:30
Rohit Waghchaure
10e8073204 fix: allow to subcotract service raw materials 2019-08-08 18:20:53 +05:30
Faris Ansari
99c26e068d fix: Set Maintenance Status fields as Read Only (#18634)
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf fix: Set Maintenance Status fields as Read Only (#18633)
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
2019-08-08 17:45:44 +05:30
Mangesh-Khairnar
bafc89f439 refactor: convert raw sql to orm 2019-08-08 17:43:23 +05:30
rohitwaghchaure
9f9184c908 fix: not able to transfer raw materials for subcontracted items (#18650) 2019-08-08 17:41:38 +05:30
rohitwaghchaure
536e6bf57c fix: group by condition in the payment reconciliation (#18657) 2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec fix: accounting period (#18477)
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
2019-08-08 17:39:13 +05:30
Mangesh-Khairnar
9bc4232af6 feat: calculate remaining leaves both multiple simultaneous allocation 2019-08-08 17:11:08 +05:30
Mangesh-Khairnar
5cbe6160ca feat: consider carry forwarded leaves on creation of encashment 2019-08-08 17:06:15 +05:30
Deepesh Garg
f2bf76a2ef fix: Show Cr or Dr symbol in chart of accounts based on balance (#18653)
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035 fix: Show Cr or Dr symbol in chart of accounts based on balance (#18654)
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650 fix: Changes in print format due to attribute name changes in frappe (#18639) 2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0 fix: Changes in print format due to attribute name changes in frappe (#18641) 2019-08-08 15:51:50 +05:30
Faris Ansari
df7644a96d fix: Show created serial nos as links in message (#18635)
Fixes #18623
2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46 fix: Show created serial nos as links in message (#18636)
Fixes #18623
2019-08-08 15:50:17 +05:30
Aditya Hase
472050bb8a fix(quickbooks): Do not build global search for QuickBooks Migrator (#18628) 2019-08-08 15:48:35 +05:30
Aditya Hase
f19b7b9122 fix(quickbooks): Do not build global search for QuickBooks Migrator (#18627) 2019-08-08 15:48:09 +05:30
Mangesh-Khairnar
e5c733bdb3 fix: Accounting period (#18630)
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
2019-08-08 15:44:11 +05:30
Suraj Shetty
c7716f0bbc Merge branch 'develop' into refactor-call-popup 2019-08-08 12:50:20 +05:30
Himanshu Warekar
b9f2a6048b test: fix test cases 2019-08-07 18:21:38 +05:30
Faris Ansari
3623452839 fix(Item Template): Fallback description string
Fixes #18572
2019-08-07 17:21:51 +05:30
Faris Ansari
2260838933 fix(Item Template): Fallback description string
Fixes #18572
2019-08-07 17:21:22 +05:30
Himanshu
1b48448b7b Merge branch 'version-12-hotfix' into qms-fixes 2019-08-07 11:32:06 +00:00
Rushabh Mehta
6276f1adc5 fix(minor): don't update modified timestamp for overdue tasks 2019-08-07 16:32:44 +05:30
Sahil Khan
9335cdd536 Merge branch 'version-12-hotfix' into version-12 2019-08-07 16:21:14 +05:30
Sahil Khan
c5ae3cc120 bumped to version 12.0.5 2019-08-07 16:41:13 +05:50
Suraj Shetty
cab8e9be89 fix(timesheet): Hours automatically used to set 0
- Case: If the company had standard working hour set
and when the user creates a timesheet with same date for
"To" and "From" then the hours field automatically used to
get reset to 0 after saving the form.
2019-08-07 10:40:29 +05:30
Suraj Shetty
0c699f0726 fix: Paid amount 0 while creating advanced payment entry
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.

Solution: Populate paid amount value after applying conversion rate
2019-08-07 10:17:05 +05:30
Suraj Shetty
9f4b270116 fix: prev_doc 2019-08-06 09:03:23 +05:30
Suraj Shetty
4ca82f9308 fix: Show contact and lead name in list view 2019-08-06 05:49:01 +05:30
Suraj Shetty
207f218db3 Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-08-06 05:44:28 +05:30
Suraj Shetty
89d8a0b6fd fix: reset_employee_emails_cache method 2019-08-06 05:44:13 +05:30
Himanshu
76c6a050af Merge branch 'version-12-hotfix' into qms-fixes 2019-08-05 17:12:44 +00:00
Deepesh Garg
235166ec41 Merge pull request #18592 from deepeshgarg007/utils_fix_v12
fix: Ambigious column in query
2019-08-05 22:38:45 +05:30
Suraj Shetty
f6f849226e Merge branch 'develop' into refactor-call-popup 2019-08-05 21:25:12 +05:30
Suraj Shetty
7d3f1fef1c fix: Employee selection for call popup
- Check if employee with matched number is also
 scheduled to receive popup
2019-08-05 21:21:45 +05:30
Mangesh-Khairnar
314647572c fix: check for old unexpired allocation 2019-08-05 15:35:19 +05:30
Mangesh-Khairnar
6bed870dfa feat: pro-rata leave allocation 2019-08-05 14:47:53 +05:30
Mangesh-Khairnar
f281f00d43 feat: auto leave encashment 2019-08-05 14:47:53 +05:30
Deepesh Garg
e4abaa7cdd Merge pull request #18591 from deepeshgarg007/utils_fix_develop
fix: Ambigious column in query
2019-08-05 14:45:30 +05:30
Himanshu Warekar
e8f95a2adf fix: TreeView fixes 2019-08-05 14:21:09 +05:30
Rucha Mahabal
d9fa83b196 fix: added Company by default in session defaults (#18471) 2019-08-05 14:15:16 +05:30
deepeshgarg007
23f30cdb8b fix: Aambigious column in query 2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6 fix: Aambigious column in query 2019-08-05 12:40:50 +05:30
Faris Ansari
9983d90e24 chore: Remove package-lock.json (#18565)
Yarn uses yarn.lock
2019-08-05 12:32:41 +05:30
Deepesh Garg
7638301d01 Merge pull request #18527 from netchampfaris/bom-comparison-tool
feat: BOM Comparison Tool
2019-08-05 11:58:46 +05:30
Suraj Shetty
0957480305 fix: Show popup to employees with same phone number 2019-08-05 11:32:51 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Frappe PR Bot
833afea3e3 feat: Updated translation (#18542) 2019-08-05 10:38:37 +05:30
Anurag Mishra
08df6bda41 fix: query (#18468) 2019-08-05 10:27:25 +05:30
Mangesh-Khairnar
31c5c1e562 fix(payroll-entry): show make bank entry button (#18497)
* fix(payroll-entry): show make bank entry button when manually submitting salary slip

* Update payroll_entry.py
2019-08-05 10:21:19 +05:30
Anurag Mishra
7e1987ed48 feat: validate cwip accounts for journal Entry (#18518) 2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0 feat: validate cwip accoutns in journal entry (#18519) 2019-08-05 10:18:37 +05:30
Mangesh-Khairnar
a3d5200194 fix(sales-order): update items (#18535)
* fix(sales-order): update items

* fix: minor changes

* Update: accounts controller
2019-08-05 10:16:40 +05:30
Mangesh-Khairnar
9accae3ddc fix(sales-order): update items (#18536)
* fix(sales-order): update items

* fix: minor changes
2019-08-05 10:16:25 +05:30
Deepesh Garg
8b0302bab9 fix: Make conversion rate optional for non itemized items (#18540) 2019-08-05 10:14:19 +05:30
Deepesh Garg
cfb899451f fix: Make conversion rate optional for non itemized items (#18541) 2019-08-05 10:14:05 +05:30
Deepesh Garg
fb5aa43e77 fix: Type error handling while getting material request items (#18549)
* fix: Type error handling while getting material request items

* fix: Remove flt
2019-08-05 10:12:42 +05:30
Deepesh Garg
713d4bb1ba fix: Type error handling while getting material request items (#18550)
* fix: Type error handling while getting material request items

* fix: Remove flt
2019-08-05 10:12:17 +05:30
Deepesh Garg
a7eaa4de14 fix: Customer price list not honored in shopping cart (#18556) 2019-08-05 10:10:53 +05:30
Deepesh Garg
65ad4287b6 fix: Customer price list not honored in shopping cart (#18557) 2019-08-05 10:10:38 +05:30
Faris Ansari
b4678d3f21 chore: Remove package-lock.json (#18564)
Yarn uses yarn.lock
2019-08-05 10:09:32 +05:30
Suraj Shetty
580fa48642 fix: Quotation list in customer portal (#18579)
* fix: Quotation list in customer portal

Customers were not able to see their quotations because of
 the recent customer field removal from quotation

* fix: Remove duplicate code
2019-08-05 10:08:35 +05:30
Mangesh-Khairnar
06a0afa039 Feat: Notify by email feature (#18587)
* feat: notify user by email in employee onboarding control

* fix: create task on update after submit
2019-08-05 10:07:05 +05:30
Nabin Hait
a813571c17 Update employee_advance.py 2019-08-05 10:05:28 +05:30
Mangesh-Khairnar
d66396f4e9 fix(employee-advance): update employee advance on change in expense claim (#18588)
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid

* Update employee_advance.py
2019-08-05 10:04:05 +05:30
Mangesh-Khairnar
c92e823651 fix(employee-advance): update employee advance on change in expense claim (#18590)
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim

* fix(expense-claim): display appropriate buttons only if linked transactions are valid
2019-08-05 10:02:32 +05:30
Suraj Shetty
35c4b78e66 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-08-04 22:23:03 +05:30
rohitwaghchaure
ed7e074985 Merge pull request #18570 from rohitwaghchaure/add_serial_no_button_not_working
fix: add serial no button not working for the delivery note
2019-08-04 12:02:43 +05:30
Deepesh Garg
6f39db6a18 Merge pull request #18576 from deepeshgarg007/taxes_and_totals_v12
fix: Error handling in taxes and totals
2019-08-03 18:27:14 +05:30
Deepesh Garg
7668cd7053 Merge pull request #18577 from deepeshgarg007/taxes_and_totals_v13
fix: Error handling in taxes and totals
2019-08-03 18:26:54 +05:30
deepeshgarg007
b656529818 fix: Error handling in taxes and totals 2019-08-03 13:49:33 +05:30
deepeshgarg007
8bf19ce81a fix: Error handling in taxes and totals 2019-08-03 13:44:44 +05:30
Deepesh Garg
4d38a5043f Merge pull request #18573 from deepeshgarg007/error_report_develop
fix: Remove payment order from bank dashboard
2019-08-03 12:17:13 +05:30
Deepesh Garg
2f1633bf41 Merge pull request #18574 from deepeshgarg007/error_report_v12
fix: Remove payment order from bank dashboard
2019-08-03 12:16:52 +05:30
deepeshgarg007
a499079250 fix: Remove non standard fieldname 2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12 2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc fix: Remove payment order from bank dashboard 2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8 fix: Remove payment order from bank dashboard 2019-08-03 10:17:44 +05:30
Suraj Shetty
4b3b358ac6 fix: Show correct label instead of showing undefined (#18559) 2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913 fix: Show correct label instead of showing undefined (#18560) 2019-08-02 21:46:28 +05:30
Rohit Waghchaure
dadd049cbf fix: add serial no button not working for the delivery note 2019-08-02 19:11:31 +05:30
Suraj Shetty
6fd3a86012 fix: Option to create pick list from work order 2019-08-02 16:48:31 +05:30
Sahil Khan
8426ff726a Merge branch 'version-12-hotfix' into version-12 2019-08-02 14:27:59 +05:30
Sahil Khan
968da1cd21 bumped to version 12.0.4 2019-08-02 14:47:59 +05:50
sahil28297
7d7e4534dd Merge pull request #18566 from scmmishra/task-fix
fix: task not updated issue
2019-08-02 14:15:19 +05:30
sahil28297
c7abc025ff Merge branch 'develop' into task-fix 2019-08-02 14:14:52 +05:30
sahil28297
77313685da Merge pull request #18567 from scmmishra/task-fix-patch1
fix: task not updated issue
2019-08-02 14:14:27 +05:30
Shivam Mishra
0313dc0f8c fix: task not updated issue 2019-08-02 14:12:36 +05:30
Shivam Mishra
dc53e8ebb0 fix: task not updated issue 2019-08-02 13:56:49 +05:30
Suraj Shetty
117161401a fix: Check zero valuation rate only for valid doctypes (#18528)
fix: Check zero valuation rate only for valid doctypes
2019-08-02 11:22:47 +05:30
Suraj Shetty
c6857e562b fix: Check zero valuation rate only for valid doctypes (#18529)
fix: Check zero valuation rate only for valid doctypes
2019-08-02 11:22:31 +05:30
Suraj Shetty
3f31a56fb3 feat(customer): Add report to show item prices per Customer (#17930)
feat(customer): Add report to show item prices per Customer
2019-08-02 11:11:51 +05:30
Suraj Shetty
c154e57603 Merge branch 'develop' into stock-ledger-fix_develop 2019-08-02 08:44:21 +05:30
Suraj Shetty
b559bf6de6 Merge branch 'version-12-hotfix' into stock-ledger-fix 2019-08-02 08:43:54 +05:30
Suraj Shetty
c57328669a feat: Add pick list print format 2019-08-02 08:14:27 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
Rohan
fc04d334da Merge branch 'develop' into develop-customer-item-price-report 2019-08-01 17:51:03 +05:30
Suraj Shetty
a7dc3735ae fix: Move folders to right location 2019-08-01 15:49:29 +05:30
Deepesh Garg
4be00502cc Merge pull request #18546 from deepeshgarg007/bank_dashboard_fix
fix: Payment Order link fix in bank dashboard
2019-08-01 15:24:53 +05:30
Deepesh Garg
097cc13072 Merge pull request #18547 from deepeshgarg007/bank_dashboard_v12
fix: Payment Order link fix in bank dashboard
2019-08-01 15:24:37 +05:30
deepeshgarg007
c16ef32b6b fix: Payment Order link fix in bank dashboard 2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39 fix: Payment Order link fix in bank dashboard 2019-08-01 13:24:48 +05:30
Suraj Shetty
31e3dada0e Merge branch 'version-12-hotfix' into bom-comparison-tool 2019-08-01 12:59:19 +05:30
Suraj Shetty
e06f486aee fix: Rename methods 2019-08-01 12:54:33 +05:30
Faris Ansari
d9e482759c style: Missing semicolon 2019-08-01 12:53:19 +05:30
Suraj Shetty
bb7a2dbb6a fix: Rename file 2019-08-01 12:38:26 +05:30
Suraj Shetty
0c1dbb116f Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-01 12:06:20 +05:30
Suraj Shetty
fbcc56536b fix: Rename Pick TIcket -> Pick List 2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2 fix: Add and rename some fields
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
2019-08-01 11:07:14 +05:30
Mangesh-Khairnar
8fb600162e fix: remove all leaves via scheduler 2019-07-31 19:31:26 +05:30
Mangesh-Khairnar
5eac8703da fix: create reverse expiry for back dated leaves 2019-07-31 19:28:21 +05:30
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16 fix: Enhancement in credit note (#18510)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
rohitwaghchaure
fdb5e6b2e5 Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix
fix: scrap item not adding while doing finished good entry
2019-07-31 00:47:01 +05:30
Rohit Waghchaure
862363521b fix: scrap item not adding while doing finished good entry 2019-07-30 23:57:58 +05:30
deepeshgarg007
f9c0ef3eb3 fix: Check zero valuation rate only for valid doctypes 2019-07-30 19:01:53 +05:30
deepeshgarg007
548293ad08 fix: Check zero valuation rate only for valid doctypes 2019-07-30 18:49:19 +05:30
Faris Ansari
f650cb8e4b style: Indent and missing semicolon 2019-07-30 17:46:15 +05:30
Faris Ansari
a4ada93834 fix: Field labels 2019-07-30 17:11:34 +05:30
Faris Ansari
66064c7827 fix: Add BOM Comparison Tool to module view 2019-07-30 17:11:18 +05:30
Faris Ansari
1214e2d2a4 feat: BOM Comparison Tool 2019-07-30 16:54:46 +05:30
Sahil Khan
de1ecee3b3 Merge branch 'version-12-hotfix' into version-12 2019-07-30 13:09:07 +05:30
Sahil Khan
403968b2f7 bumped to version 12.0.3 2019-07-30 13:29:07 +05:50
Suraj Shetty
72d03464dc fix: Show "Get Item Location" only if there are reference items 2019-07-30 11:56:24 +05:30
Suraj Shetty
14fb1600ec fix: Select location based on group warehouse 2019-07-30 11:47:21 +05:30
Suraj Shetty
341f7733d1 fix: Make item read-only in item location table 2019-07-30 10:02:50 +05:30
Suraj Shetty
e260e8239f fix: Batch number selection code 2019-07-30 10:02:10 +05:30
Suraj Shetty
55ab31314c fix: Add code to set batch no
- And split item based on batch availibility
2019-07-30 09:02:03 +05:30
rohitwaghchaure
2a45eadc28 Merge pull request #18514 from deepeshgarg007/trail_balance_fix_hotfix
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 20:56:00 +05:30
Suraj Shetty
36c724d7b5 fix(Issue): reset issue fulfilled indicator (#18454)
fix(Issue): reset issue fulfilled indicator
2019-07-29 18:27:53 +05:30
Suraj Shetty
344df219a4 Merge pull request #18453 from hrwX/iss_ful_fix_v12
fix(Issue): change agreement fulfilled to ongoing when resetting SLA
2019-07-29 18:27:43 +05:30
rohitwaghchaure
3e4cabfd6c Merge pull request #18516 from rohitwaghchaure/can_t_compare_datetime_issue_for_quotation
fix: can't compare datetime.date to unicode
2019-07-29 17:59:08 +05:30
Rohit Waghchaure
40e35048b8 fix: can't compare datetime.date to unicode 2019-07-29 17:14:39 +05:30
Suraj Shetty
9ad10cb425 test: Add basic tests 2019-07-29 16:52:26 +05:30
Deepesh Garg
62daa43a4c Merge pull request #18513 from deepeshgarg007/trail_balance_fix
fix: Opening balance not getting calculated in trail balance report
2019-07-29 15:38:39 +05:30
rohitwaghchaure
a55e4e2c03 Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding
fix: scrap item not adding while doing finished good entry
2019-07-29 15:30:24 +05:30
deepeshgarg007
107c07e5cb fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0 fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 14:57:33 +05:30
Deepesh Garg
b566cc3e79 Merge pull request #18512 from deepeshgarg007/defaut_accounting_dimension_v12
fix: Company specific default accounting dimensions
2019-07-29 14:02:28 +05:30
deepeshgarg007
f37fb82069 fix: Code cleanup 2019-07-29 12:14:49 +05:30
deepeshgarg007
d9f3ba5fda fix: Reload doc in patch 2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2 fix: GL entry validation fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91 fix: Test cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb fix: Test Cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b fix: Set query fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c fix: Codacy Fixes 2019-07-29 12:14:49 +05:30
deepeshgarg007
acc0958ead fix: Patch 2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1 fix: Remove dimensions from boot 2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79 fix: Added default dimension and filter in bootinfo 2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310 fix: Default Accounting Dimensions in doctypes 2019-07-29 12:14:49 +05:30
Deepesh Garg
8d00ee4f81 Merge pull request #18403 from deepeshgarg007/defaut_accounting_dimension
fix: Company specific default accounting dimensions
2019-07-29 12:12:40 +05:30
rohitwaghchaure
8c8b1f2da6 Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +05:30
Suraj Shetty
7e20324776 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-29 09:41:08 +05:30
deepeshgarg007
ec421df4e4 fix: Code cleanup 2019-07-29 08:58:56 +05:30
Suraj Shetty
27bdba49d4 test: Add test case statements 2019-07-28 22:04:07 +05:30
Suraj Shetty
d43764c8e5 fix: Use .set method to set serial no. 2019-07-28 22:03:28 +05:30
deepeshgarg007
6a43f6718a fix: Reload doc in patch 2019-07-28 10:30:32 +05:30
deepeshgarg007
a65ad10c62 fix: GL entry validation fix 2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241 Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension 2019-07-27 18:11:34 +05:30
Sahil Khan
d800f993b0 Merge branch 'version-12-hotfix' into version-12 2019-07-27 12:54:21 +05:30
Sahil Khan
82a9118cb2 bumped to version 12.0.2 2019-07-27 13:14:21 +05:50
Mangesh-Khairnar
f0f4dbd5f8 fix(payroll-entry): show make bank entry button when manually submitting salary slip (#18498) 2019-07-27 10:05:33 +05:30
Michelle Alva
e666b882e7 fix: added payroll period in HR module (#18500) 2019-07-27 10:03:18 +05:30
Himanshu
e83b0c3599 Merge branch 'version-12-hotfix' into iss_ful_fix_v12 2019-07-26 12:51:55 +00:00
Himanshu
9443e8e85f Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 12:51:09 +00:00
rohitwaghchaure
0f3281fe43 Merge pull request #18496 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_v12
fix: Pro rata calculation is not working for WDV depreciation method
2019-07-26 16:11:38 +05:30
Deepesh Garg
ce63b1f669 Merge pull request #18317 from deepeshgarg007/stock_ageing_fix
fix: Enhancement in stock ageing report
2019-07-26 15:45:48 +05:30
Deepesh Garg
809025c746 Merge pull request #18495 from deepeshgarg007/stock-ageing-v12
fix: Enhancement in stock ageing report
2019-07-26 15:45:24 +05:30
Saurabh
af19347376 Merge branch 'develop' into scrap_item_not_adding 2019-07-26 15:10:17 +05:30
Deepesh Garg
64968979b2 Merge branch 'version-12-hotfix' into stock-ageing-v12 2019-07-26 14:42:34 +05:30
Aditya Hase
dc4452ffe3 perf(travis): Faster builds (#18491)
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
deepeshgarg007
2f87fd7951 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into stock-ageing-v12 2019-07-26 13:32:11 +05:30
Suraj Shetty
64f174fcaa feat: Get item location from reference items
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
2019-07-26 13:22:05 +05:30
Rohit Waghchaure
53f5e2e066 fixed test cases and the logic for pro rata calculation 2019-07-26 13:21:46 +05:30
Rohit Waghchaure
3844a98c42 fix: Pro rata calculation is not working for WDV depreciation method 2019-07-26 13:21:33 +05:30
Sahil Khan
cbef3f7bd7 Merge branch 'version-12-hotfix' into version-12 2019-07-26 13:09:15 +05:30
Sahil Khan
ecd4d3883e bumped to version 12.0.1 2019-07-26 13:29:14 +05:50
Himanshu
e87fbcc286 Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 07:31:44 +00:00
Deepesh Garg
941e21092c Merge branch 'develop' into stock_ageing_fix 2019-07-26 12:47:05 +05:30
Deepesh Garg
c391d65dc3 Merge pull request #18488 from adityahase/faster
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
Himanshu
b4ecd29015 Merge branch 'version-12-hotfix' into iss_ful_fix_v12 2019-07-26 06:58:59 +00:00
Himanshu
0162d0a2ea Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 06:58:55 +00:00
rohitwaghchaure
ad89b029c2 Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
06f99cae36 fix: Fixes in stock ageing report 2019-07-26 10:32:08 +05:30
deepeshgarg007
15154d4bd0 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-26 10:30:22 +05:30
deepeshgarg007
7fdab021b6 fix: Use get_serial_no and remove batch 2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a fix: Remove batch 2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e fix: Consider serial no and batches in Stock ageing report 2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322 fix: Enhancement in stock ageing report 2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35 fix: Changed columns to new dict form 2019-07-26 10:24:40 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc fix: Test cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc fix: Test Cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c fix: Set query fix 2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb fix: Codacy Fixes 2019-07-26 09:14:42 +05:30
deepeshgarg007
703fc08467 fix: Patch 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c fix(Account): Pass parent currency to child currency
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Deepesh Garg
6f6f4b9417 Merge pull request #18481 from deepeshgarg007/bank_reco_v12
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:49:03 +05:30
Deepesh Garg
059c568f08 Merge pull request #18482 from deepeshgarg007/bank_reco_develop
fix: Dynamic link issue fix in Bank reconciliation statement
2019-07-26 08:48:49 +05:30
Deepesh Garg
641e8fea02 Merge branch 'develop' into bank_reco_develop 2019-07-26 08:48:02 +05:30
Deepesh Garg
ea56f317c8 Merge pull request #18473 from deepeshgarg007/gstr-1-query-v12
fix: GSTR-1 query fix
2019-07-26 08:46:15 +05:30
Deepesh Garg
cd645de4f9 Merge pull request #18474 from deepeshgarg007/gstr-1-query-v13
fix: GSTR-1 query fix
2019-07-26 08:45:59 +05:30
Faris Ansari
6998412990 fix(Account): Pass parent currency to child currency
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:15:45 +05:30
Aditya Hase
f2fb461e40 perf(tests): Remove unnecessary tearDown code 2019-07-26 05:54:04 +05:30
Aditya Hase
f4314a25b6 perf(travis): Use setUpClass instead of setUp 2019-07-26 05:54:04 +05:30
Aditya Hase
bd69f43322 fix(stock): Fix travis builds 2019-07-26 05:54:04 +05:30
Aditya Hase
d1bb274c22 perf(tests): Use country with lesser fixtures 2019-07-26 05:54:04 +05:30
Aditya Hase
8773d931be perf(tests): Do not unnecessarily create companies 2019-07-26 05:54:04 +05:30
Aditya Hase
0d333894c9 perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 05:54:04 +05:30
Aditya Hase
b6906c58d1 fix(travis): Install wkhtmltopdf 2019-07-26 05:54:04 +05:30
Aditya Hase
0046357b86 fix(travis): Remove redundant arguments 2019-07-26 05:54:04 +05:30
Aditya Hase
ac431c8e33 fix(travis): Use --site parameter 2019-07-26 05:54:04 +05:30
Aditya Hase
7b39aa7f91 fix(travis): Merge install and before_script 2019-07-26 05:54:03 +05:30
Aditya Hase
6076443b6b fix(travis): Execute get-app before bench start 2019-07-26 05:54:03 +05:30
Aditya Hase
50e2d4aa6a perf(travis): Use travis optimizations 2019-07-26 05:54:03 +05:30
Aditya Hase
e31284189f perf(travis): Do not build assets 2019-07-26 05:54:03 +05:30
Aditya Hase
30628b016b perf(travis): Remove unnecessary processes from Procfile 2019-07-26 05:54:03 +05:30
Aditya Hase
7c44adad3e fix(travis): Use MariaDB credentials from site_config.json 2019-07-26 05:54:03 +05:30
Aditya Hase
e4f78a0b6a perf(travis): Do not waste 10 seconds 2019-07-26 05:54:03 +05:30
Aditya Hase
903e87899b fix(travis): Execute get-app and reinstall after bench start 2019-07-26 05:54:03 +05:30
Aditya Hase
1e9e471714 fix(travis): Do not disable scheduler using CLI 2019-07-26 05:54:03 +05:30
Aditya Hase
fb2ec7186d fix(travis): Do not use use_site 2019-07-26 05:54:03 +05:30
Aditya Hase
185e2a2fd8 fix(travis): Setup MariaDB 2019-07-26 05:54:03 +05:30
Aditya Hase
e2b16e3edb fix(travis): Remove unused files 2019-07-26 05:54:03 +05:30
Aditya Hase
23f24d13dd fix(travis): Remove travis/bench_init.sh 2019-07-26 05:54:03 +05:30
Aditya Hase
3f6ac2d993 fix(travis): Do not execute install.py 2019-07-26 05:54:03 +05:30
Aditya Hase
2fb9e8a94d fix(travis): Install coverall after tests 2019-07-26 05:54:03 +05:30
Aditya Hase
9b24a42017 fix(travis): Use MariaDB 10.3 2019-07-26 05:54:03 +05:30
Aditya Hase
e0e78fb0e2 fix(travis): Restructure build matrix 2019-07-26 05:54:03 +05:30
Aditya Hase
029de1a244 fix(travis): Remove unnecessary commands 2019-07-26 05:54:03 +05:30
Aditya Hase
96eec7e2cd chore: Empty commit 2019-07-26 05:06:42 +05:30
Aditya Hase
1e82638ae8 perf(tests): Remove unnecessary tearDown code 2019-07-26 03:52:17 +05:30
Aditya Hase
ff79463e36 perf(travis): Use setUpClass instead of setUp 2019-07-26 03:08:45 +05:30
Aditya Hase
6bc2988623 fix(stock): Fix travis builds 2019-07-26 03:08:45 +05:30
Aditya Hase
0f072d7d40 perf(tests): Use country with lesser fixtures 2019-07-26 01:11:57 +05:30
Aditya Hase
0ae786adec perf(tests): Do not unnecessarily create companies 2019-07-26 00:38:51 +05:30
Aditya Hase
6a5b7f751c perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 00:23:13 +05:30
Aditya Hase
a630a24040 fix(travis): Install wkhtmltopdf 2019-07-25 22:40:26 +05:30
Himanshu
2d8f42a007 Merge branch 'version-12-hotfix' into iss_ful_fix_v12 2019-07-25 16:58:37 +00:00
Aditya Hase
fdb395c977 fix(travis): Remove redundant arguments 2019-07-25 21:51:12 +05:30
Aditya Hase
dac46ed6e1 fix(travis): Use --site parameter 2019-07-25 21:50:46 +05:30
Aditya Hase
6002fd7820 fix(travis): Merge install and before_script 2019-07-25 21:39:30 +05:30
Aditya Hase
4b680178be fix(travis): Execute get-app before bench start 2019-07-25 21:38:07 +05:30
Aditya Hase
5542af9be8 perf(travis): Use travis optimizations 2019-07-25 21:36:22 +05:30
Aditya Hase
1de45877b1 perf(travis): Do not build assets 2019-07-25 21:28:15 +05:30
Aditya Hase
13919440a7 perf(travis): Remove unnecessary processes from Procfile 2019-07-25 21:27:20 +05:30
Aditya Hase
543996652b fix(travis): Use MariaDB credentials from site_config.json 2019-07-25 21:25:53 +05:30
Aditya Hase
6f978d2497 perf(travis): Do not waste 10 seconds 2019-07-25 21:23:43 +05:30
Aditya Hase
97ad6352af fix(travis): Execute get-app and reinstall after bench start 2019-07-25 21:23:24 +05:30
Aditya Hase
6e2fa02c56 fix(travis): Do not disable scheduler using CLI 2019-07-25 21:21:54 +05:30
Aditya Hase
6f025e7b4f fix(travis): Do not use use_site 2019-07-25 21:21:19 +05:30
Aditya Hase
8005022508 fix(travis): Setup MariaDB 2019-07-25 21:19:30 +05:30
Aditya Hase
06ca6f7705 fix(travis): Remove unused files 2019-07-25 21:18:05 +05:30
Aditya Hase
ac185989ff fix(travis): Remove travis/bench_init.sh 2019-07-25 21:15:30 +05:30
Aditya Hase
306a410b77 fix(travis): Do not execute install.py 2019-07-25 21:11:18 +05:30
Aditya Hase
c49d45497c fix(travis): Install coverall after tests 2019-07-25 21:10:06 +05:30
Aditya Hase
828699f26a fix(travis): Use MariaDB 10.3 2019-07-25 21:09:34 +05:30
Aditya Hase
7204bcb932 fix(travis): Restructure build matrix 2019-07-25 17:48:17 +05:30
Mangesh-Khairnar
5ca3e83a00 feat: add ledger link in hr config 2019-07-25 14:35:39 +05:30
deepeshgarg007
f56284b0c1 Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:44:50 +05:30
Suraj Shetty
3b31800533 fix: Add logic to set batch no [WIP]
- Add pick ticket reference item
2019-07-25 11:22:45 +05:30
deepeshgarg007
b1f3e0224c fix: GSTR-1 query fix 2019-07-24 21:36:56 +05:30
deepeshgarg007
89339bb80c fix: GSTR-1 query fix 2019-07-24 21:32:55 +05:30
Anurag Mishra
0505135f90 Merge branch 'develop' into refactor-call-popup 2019-07-24 18:33:14 +05:30
sahil28297
3f07305ef6 Merge pull request #18469 from scmmishra/changelog-url-fixes
fix: url fixes for changelog
2019-07-24 16:29:06 +05:30
Shivam Mishra
192db7d623 fix: url fixes for changelog 2019-07-24 16:22:37 +05:30
sahil28297
29c71f5bd5 Merge pull request #18467 from scmmishra/release-notes-fixes
fix: urls for changelog
2019-07-24 16:14:00 +05:30
sahil28297
6bd50b1e20 Merge branch 'version-12-hotfix' into release-notes-fixes 2019-07-24 16:13:44 +05:30
Shivam Mishra
8b08684e07 fix: more url fixes 2019-07-24 16:10:34 +05:30
Shivam Mishra
cb19ee457c fix: urls for changelog 2019-07-24 16:05:59 +05:30
Aditya Hase
14600e6a3e fix(travis): Remove unnecessary commands 2019-07-24 15:18:52 +05:30
Suraj Shetty
0576ad5ef9 fix: Move pick list creation code to picklist.py file 2019-07-24 15:16:03 +05:30
Rucha Mahabal
4865eabee5 fix: add Company by default in session defaults (#18460) 2019-07-24 13:37:54 +05:30
Rohit Waghchaure
6d0c6a17d9 fix: multi currency bank reco issue 2019-07-24 12:48:06 +05:30
Suraj Shetty
778b4926bf fix: Fetch warehouse location from Bin 2019-07-24 11:27:32 +05:30
Himanshu Warekar
20e1a3e199 fix: reset issue fulfilled indicator 2019-07-23 17:00:23 +05:30
Himanshu Warekar
05425d414c fix: change agreement fulfilled to ongoing 2019-07-23 16:58:13 +05:30
Rohit Waghchaure
bcfbc792b4 fix: scrap item not adding while doing finished good entry 2019-07-23 16:05:29 +05:30
Faris Ansari
06c7a7e660 fix(website): Remove references to Product Settings.products_a… (#18451)
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
2019-07-23 13:40:40 +05:30
Suraj Shetty
ed4f8cf65d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-23 13:29:41 +05:30
Mangesh-Khairnar
bb1be2e2ee chore: change fieldname for carried forward leave expiry 2019-07-23 13:18:40 +05:30
Aditya Hase
48d9cfe304 fix(website): Remove references to Product Settings.products_a… (#18448)
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
2019-07-23 12:05:31 +05:30
deepeshgarg007
a19d1d6926 fix: Fixes in stock ageing report 2019-07-23 08:30:09 +05:30
Mangesh-Khairnar
fd1d4c2927 chore: split expire allocation 2019-07-22 18:05:27 +05:30
Mangesh-Khairnar
08c02287dd fix: expiry allocaton after creating all the transactions 2019-07-22 17:47:03 +05:30
Saurabh
85d88395ba changelog: release 12.0.0 2019-07-22 17:39:30 +05:30
sahil28297
3e85b4937b Release Version 12 2019-07-22 17:31:14 +05:30
Nabin Hait
7b76cdbb29 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-07-22 17:01:44 +05:30
Nabin Hait
cd1094e1c2 Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop 2019-07-22 17:01:08 +05:30
Nabin Hait
ca25b925f5 fix: Calcellation logic for reconciliation of serialized items 2019-07-22 17:00:32 +05:30
Mangesh-Khairnar
3f8326358b fix: remove wrong status update for order type maintenance (#18444) 2019-07-22 16:24:56 +05:30
deepeshgarg007
d9cc84892b fix: Use get_serial_no and remove batch 2019-07-22 15:56:41 +05:30
Suraj Shetty
88236b2a7d feat: Email Campaign (#18291)
feat: Email Campaign
2019-07-22 15:34:38 +05:30
Mangesh-Khairnar
f6cf58fa8c fix: change get all to sql list 2019-07-22 15:32:41 +05:30
deepeshgarg007
3877b5407c fix: Remove batch 2019-07-22 15:30:18 +05:30
Suraj Shetty
1e9a6e6b7e Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup 2019-07-22 15:19:31 +05:30
Suraj Shetty
4177ecb6b2 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-07-22 15:18:03 +05:30
Mangesh-Khairnar
cbc22e6369 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-22 13:57:04 +05:30
Mangesh-Khairnar
29e9f14f95 fix: minor changes 2019-07-22 13:54:39 +05:30
Suraj Shetty
433e587a95 style: Add tabs 2019-07-22 13:21:35 +05:30
Suraj Shetty
002474367b Merge branch 'develop' into email-campaign 2019-07-22 13:20:06 +05:30
Rucha Mahabal
6224266512 fix: replaced frappe.db.get_value with frappe.db.exists 2019-07-22 13:04:43 +05:30
deepeshgarg007
55ca054cb4 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-22 12:46:30 +05:30
Rucha Mahabal
d23a95c06e fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign 2019-07-22 12:26:52 +05:30
Rushin Parikh
40240b7d96 fix: filter reference name by cost center in journal entry account (#17948)
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice

* Update journal_entry.js
2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142 fix: payment document link fix (#18301) 2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
270c44a556 Enhancement(HR): hiring process (#18129)
* feat: allow update of vacancies in staffing plan

* feat: update staffing plan on creation of job offer

* feat: update staffing plan after submit

* fix: change staffing plan on creation of employee

* fix: calculate vacancies based on job offers and staffing-plan

* test: job applicant creation

* feat: update job applicant on creation of job offer

* test: staffing plan creation

* fix: number of positions calculation

* test: job offer creation and update

* fix: update status of job applicant on change of job offer

* fix: linting

* fix: set number of positions

* fix: linting

* fix(job-offer): add a more descriptive message

* fix: translations in validation message

* Update validation message
2019-07-22 11:47:53 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365)
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
2019-07-22 11:35:16 +05:30
Faris Ansari
74d5e9d32a fix: Set project in Timesheet (#18371)
* fix: Set project in Timesheet

* style: Missing semicolon
2019-07-22 11:34:00 +05:30
Faris Ansari
e3b3ac8a59 fix: Fetch email when making Opportunity from Lead (#18373) 2019-07-22 11:31:30 +05:30
Faris Ansari
7ed5919d5b fix(LoanApplication): Repayment amount check (#18376)
* fix: Clickable Asset link

* fix(LoanApplication): Repayment amount check
2019-07-22 11:30:05 +05:30
Mangesh-Khairnar
88620d6cbb fix: precision on comparing with the outstanding amount (#18375) 2019-07-22 11:29:26 +05:30
Mangesh-Khairnar
64c780e8c7 fix: update percentage on creation of invoice for zero amt transaction (#18382) 2019-07-22 11:28:58 +05:30
rohitwaghchaure
5be91173a1 Merge pull request #18108 from kaynes-technology/batch_bom_operations
feat: Add batch operation times in BOM Operation
2019-07-22 11:26:19 +05:30
Saurabh
90d7a8888f fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398) 2019-07-22 11:22:34 +05:30
Anurag Mishra
23d4b7cc46 fis: mapped cost center in gl entries (#18404) 2019-07-22 11:22:03 +05:30
Himanshu
73d446023d fix: file attach via import (#18414) 2019-07-22 11:19:47 +05:30
Aditya Hase
dc42cc3998 fix(sales-invoice): Use orm instead of frappe.db.sql (#18434) 2019-07-22 11:19:07 +05:30
Aditya Hase
195465cdd9 fix(tally): Ignore unhandled vouchers silently (#18430)
Vouchers that affect inventory entries but are not of type
Sales, Purchase, Credit Note, Debit Note are not handled.

Custom Vouchers are also not handled.
2019-07-22 11:18:11 +05:30
Mangesh-Khairnar
16a0458e29 fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440) 2019-07-22 11:16:40 +05:30
Deepesh Garg
60a291af8f fix: Sample qty validation fix in purchase receipt (#18419)
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2019-07-22 11:14:14 +05:30
crescent28
b978c9173d fix: added null check for filters (#18416)
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome! 

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-22 11:13:27 +05:30
Rucha Mahabal
324ab98b99 Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign 2019-07-22 03:27:29 +05:30
Rucha Mahabal
8d994cb1f2 fix: allow only 1 active Email Campaign for a lead/contact at a time 2019-07-22 03:26:40 +05:30
Rucha Mahabal
b54459e588 dash: added Email Campaign to CRM dashboard 2019-07-22 03:23:40 +05:30
rohitwaghchaure
83cba247a7 Merge pull request #18435 from rohitwaghchaure/fix_fieldtype_for_disable_field
fix: disable field's fieldtype changed from data to check
2019-07-21 01:03:03 +05:30
Rohit Waghchaure
93b7ece8b0 fix: disable field's fieldtype changed from data to check 2019-07-21 00:02:09 +05:30
Suraj Shetty
34b4b77920 Merge branch 'develop' into email-campaign 2019-07-20 19:42:16 +05:30
Deepesh Garg
85b6ef8e4b Merge pull request #18432 from deepeshgarg007/get_balance
fix: Condition fix in get_balance_on function
2019-07-20 16:51:00 +05:30
deepeshgarg007
2ddbebfae0 fix: Condition fix 2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470 fix: Assignment fix 2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1 fix: Condition fix in get_balance_on function 2019-07-20 14:46:59 +05:30
Anurag Mishra
d1d8d24d0f fix: filters conditions in loan repayment (#18428) 2019-07-20 06:31:22 +05:30
Karthikeyan S
fcdcfbf302 fix(loan): Loan Tenure Formula (#18424) 2019-07-20 00:18:44 +05:30
Karthikeyan S
747c2624cd fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401)
fixes bug introduced by commit 6a7969117f
2019-07-19 22:49:21 +05:30
Rucha Mahabal
a566b4e24a Merge branch 'develop' into email-campaign 2019-07-19 15:07:56 +05:30
Himanshu
0a8816e053 feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110) 2019-07-19 14:38:04 +05:30
Deepesh Garg
fefe4ac095 Merge pull request #18381 from surajshetty3416/fix-payroll-UI
fix: Show submit after salary slip creation
2019-07-19 12:09:21 +05:30
Deepesh Garg
b7fc8fded8 Merge pull request #18397 from surajshetty3416/employee-skill-map-config
fix: Add Employee Skill Map to HR module page
2019-07-19 12:07:39 +05:30
rohitwaghchaure
65f01dddc0 Merge pull request #18415 from frappe/Salmanmulani-patch-1
fix: added default value for projected_qty in bin_dict
2019-07-19 11:52:57 +05:30
Salmanmulani
b752acf803 fix: added default value for projected_qty in bin_dict
`projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError.

This PR fixes this

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-19 11:44:49 +05:30
Suraj Shetty
d33c2337cf Merge branch 'develop' into employee-skill-map-config 2019-07-19 10:45:03 +05:30
Suraj Shetty
fea0fc02cd Merge branch 'develop' into fix-payroll-UI 2019-07-19 10:44:56 +05:30
Deepesh Garg
635dc1dfda Merge pull request #18408 from rohitwaghchaure/not_able_to_make_material_request_for_product_bundle_from_so
fix: not able to make material request for bundle items from the sale…
2019-07-19 09:48:07 +05:30
Deepesh Garg
f449f51147 Merge branch 'develop' into fix-payroll-UI 2019-07-19 08:07:35 +05:30
rohitwaghchaure
8fedf53304 Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-19 08:00:33 +05:30
Rohit Waghchaure
9fe6e00a4e fix: not able to make material request for bundle items from the sales order 2019-07-19 07:54:08 +05:30
Suraj Shetty
e0d8cf1851 fix: Add Employee Skill Map to HR module page 2019-07-18 15:58:50 +05:30
Suraj Shetty
22ff54b777 Merge branch 'develop' into fix-payroll-UI 2019-07-18 12:50:31 +05:30
Anurag Mishra
0e23307dbf fix: handled value Error (#18361) 2019-07-18 12:43:18 +05:30
Frappe PR Bot
98a9a4865e feat: Updated translation (#18364) 2019-07-18 12:42:31 +05:30
Suraj Shetty
4bf65dd0d9 Merge branch 'develop' into develop-customer-item-price-report 2019-07-18 10:15:20 +05:30
Suraj Shetty
4302c4aa4e Merge branch 'develop' into fix-payroll-UI 2019-07-18 08:50:16 +05:30
Govind S Menokee
ce42c53c1c Merge branch 'develop' into batch_bom_operations 2019-07-17 22:40:02 +05:30
Govind S Menokee
51b7b6f5d0 feat: remove explicit commit call 2019-07-17 22:38:30 +05:30
rohitwaghchaure
6349f61882 Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop
fix: offline pos syncing issue for customer
2019-07-17 21:37:55 +05:30
rohitwaghchaure
c0731f6fd7 Merge pull request #18387 from rohitwaghchaure/cost_center_not_able_to_access_develop
fix: cost center not able to access
2019-07-17 21:37:16 +05:30
Rohit Waghchaure
438efb4008 fix: cost center not able to access 2019-07-17 21:21:58 +05:30
Rohit Waghchaure
0851c94e9b fix: offline pos syncing issue for customer 2019-07-17 20:36:33 +05:30
Suraj Shetty
f9c650f8e6 fix: Show submit after salary slip creation 2019-07-17 19:38:46 +05:30
Rohit Waghchaure
dcf2d3532e fix: address and taxes not set as per pos profile in the pos invoice 2019-07-17 19:28:36 +05:30
rohitwaghchaure
41aee35070 Merge pull request #18369 from Anurag810/fix_precision_v12
fix: precision for base grand total amount
2019-07-17 19:00:43 +05:30
rohitwaghchaure
3403d1cc44 Merge pull request #18095 from scmmishra/remove-move-stock-summary
refactor: move and add for serialized and batch items in stock summary
2019-07-17 18:50:00 +05:30
Suraj Shetty
06b56adc71 Merge branch 'develop' into develop-customer-item-price-report 2019-07-17 17:29:42 +05:30
Suraj Shetty
6824838ab0 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-17 15:39:09 +05:30
Anurag Mishra
8a06b8fd38 fix precision 2019-07-17 14:55:16 +05:30
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Suraj Shetty
9eb091162a Merge branch 'develop' into refactor-call-popup 2019-07-17 13:23:54 +05:30
Suraj Shetty
82cfccab2f fix: Get user_id of employee instead of name
- Remove caching from lead
2019-07-17 11:52:35 +05:30
Deepesh Garg
807ef6af41 Merge pull request #18340 from deepeshgarg007/ac_dim_usability_fixes
fix: Usability fixes in Accounting Dimensions
2019-07-16 19:25:54 +05:30
Deepesh Garg
0d7cc663c8 Merge pull request #18348 from rohitwaghchaure/get_items_from_not_pulled_the_description_set_in_bom
fix: description set in the bom not pulled in the material request
2019-07-16 19:23:35 +05:30
Deepesh Garg
902e5ab744 Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
deepeshgarg007
4a7f370b15 fix: Consider serial no and batches in Stock ageing report 2019-07-16 16:08:50 +05:30
Faris Ansari
a4e0532df0 fix: Project Template should be set only once (#18354) 2019-07-16 15:59:37 +05:30
Suraj Shetty
2295921821 Merge branch 'develop' into refactor-call-popup 2019-07-16 13:54:07 +05:30
Suraj Shetty
e7d277d51e fix: Last communication query 2019-07-16 13:53:41 +05:30
Shivam Mishra
7339c72208 Update item_dashboard.js 2019-07-16 13:19:13 +05:30
Shivam Mishra
5738c93b8f style: commonified move and add button handler 2019-07-16 12:52:19 +05:30
Shivam Mishra
7ab6010225 Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary 2019-07-16 12:33:13 +05:30
rohitwaghchaure
e3a1718f42 Merge pull request #18355 from Mangesh-Khairnar/fix-get-outstanding-invoices
fix(payment-entry): remove unused argument
2019-07-16 12:33:06 +05:30
Shivam Mishra
fd6ff62bdb style: code styling fixes 2019-07-16 12:32:50 +05:30
Mangesh-Khairnar
b560050334 fix(payment-entry):remove unused argument 2019-07-16 12:11:44 +05:30
Suraj Shetty
f5dd494716 fix(call popup): Multiple changes
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
 standard fields
- Increase timeout to hide popup after the call has been disconnected.
2019-07-16 11:07:25 +05:30
Deepesh Garg
8c21703959 fix: Fixes in get_balance_on function (#18324) 2019-07-16 09:41:01 +05:30
Faris Ansari
82770d9152 fix: Project fixes (#18343)
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
2019-07-16 09:40:09 +05:30
deepeshgarg007
6ecbd97fbe Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-16 09:02:48 +05:30
Deepesh Garg
ce3594796c Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop
fix: Address fixes in quotation and opportunity
2019-07-16 08:42:18 +05:30
Deepesh Garg
8fcd426dab Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop
feat: added payment terms filter in the accounts payable summary
2019-07-16 08:39:30 +05:30
deepeshgarg007
af6c09ae09 fix: Codacy 2019-07-16 08:33:13 +05:30
Govind S Menokee
2ab9947647 Merge branch 'develop' into batch_bom_operations 2019-07-16 02:12:24 +05:30
Govind S Menokee
7d9d027bfe feat: update modified to fetch latest state in patches 2019-07-16 02:01:27 +05:30
Rohit Waghchaure
4c0dffe687 feat: added payment terms filter in the accounts payable summary 2019-07-16 02:00:41 +05:30
Govind S Menokee
90fc3aff72 feat: add patch for default batch_size for old records 2019-07-16 01:48:35 +05:30
Rohit Waghchaure
c67743b1f8 fix: description set in the bom not pulled in the material request 2019-07-16 01:27:26 +05:30
rohitwaghchaure
e9f0e88f9b fix: taxes sequence if shipping rule is set in the sales invoice (#18329) 2019-07-15 18:57:25 +05:30
Deepesh Garg
322053ee1b Merge pull request #18136 from nabinhait/inv-disc-improvements
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
deepeshgarg007
84d1e12f34 fix: Typo 2019-07-15 18:42:22 +05:30
deepeshgarg007
8cbc22062b fix: Remove cost center filter from customer credit balance report 2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91 fix: Remove cost center filter from customer credit balance report 2019-07-15 18:32:10 +05:30
deepeshgarg007
2093ffc15b fix: Usability fixes in accountng dimensions 2019-07-15 18:21:05 +05:30
Nabin Hait
6e264701cb Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items 2019-07-15 18:12:49 +05:30
Nabin Hait
868766ddf0 refactor: Refactored over delivery/receipt/billing fields (#17788)
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
2019-07-15 18:02:58 +05:30
Rucha Mahabal
bbb22ad082 fix: child table naming 2019-07-15 17:52:50 +05:30
sahil28297
39c3cfa25d fix(hr_setting): fix translation method call (#18328) 2019-07-15 11:25:26 +00:00
sahil28297
7697066cc2 fix(sales_order_list): compare type as well (#18331)
* fix(sales_order_list): compare type as well

* fix(sales_order_list): compare type as well
2019-07-15 11:25:06 +00:00
sahil28297
ec810a4a55 fix(product_page): compare type as well and provide base class for parseInt (#18332) 2019-07-15 11:24:41 +00:00
sahil28297
96f33cef49 Merge branch 'develop' into quo_opp_address_fix_develop 2019-07-15 15:42:55 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
Faris Ansari
1abd1e79a9 fix: Module Links (#18318)
* fix: Add Project Billing Summary link

* fix: Bank Guarantee shouldn't depend on Bank Guarantee
2019-07-15 14:34:10 +05:30
Faris Ansari
280fe396b9 fix: Dont rebuild cache on cache bust (#18319)
- Results in a lot of stale background jobs
- Cache will be built when needed
2019-07-15 14:30:21 +05:30
Anurag Mishra
e37ff39836 fix: Validate loan repayment amount in Loan Application (#18169)
* fix: validate loan repayment amount

* fix: test for loan application
2019-07-15 14:16:52 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30
Himanshu
94a0d45b77 fix: do not add an extra day (#18311) 2019-07-15 14:06:50 +05:30
Michelle Alva
6abb63b445 refactor: Refactor module links of Accounting, HR, Project (#18160) 2019-07-15 14:00:00 +05:30
Nabin Hait
d83e39d0ac Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements 2019-07-15 13:56:29 +05:30
Nabin Hait
5435b7e9eb fix: Null issue 2019-07-15 13:56:09 +05:30
deepeshgarg007
eac5461229 fix: Address filtering fix in opportunity 2019-07-15 13:55:08 +05:30
deepeshgarg007
d5fcab5f81 fix: Set taxes fix for lead 2019-07-15 12:44:11 +05:30
Govind S Menokee
14ec76e8d9 feat: remove is_batch_operation from select query 2019-07-14 23:06:10 +05:30
Govind S Menokee
5965469abd feat: remove is_batch_operation checkbox from work order operation 2019-07-14 23:02:33 +05:30
Govind S Menokee
f3e10a489d feat: remove check box for batch operation 2019-07-14 22:55:12 +05:30
deepeshgarg007
f7395916c8 fix: Accounting Dimensions in Customer Credit Balance report 2019-07-14 18:44:32 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
rohitwaghchaure
3643d67249 Merge pull request #18023 from fproldan/fix_by_voucher_order_develop
fix: General Ledger Group by Voucher not ordering by posting_date for develop
2019-07-14 17:23:54 +05:30
rohitwaghchaure
f414c8945f Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree
fix: Dr / Cr label for balance of the ledgers in the account tree
2019-07-14 17:00:58 +05:30
Himanshu
b395daf76c Merge pull request #18307 from hrwX/stat-fix
fix(Quality): miscellaneous fixes
2019-07-13 18:13:16 +00:00
deepeshgarg007
581d931031 fix: Enhancement in stock ageing report 2019-07-13 21:58:32 +05:30
Himanshu Warekar
dc02f4d07d fix: miscellaneous fixes 2019-07-13 20:00:25 +05:30
deepeshgarg007
d43d19acfd Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-13 11:40:05 +05:30
deepeshgarg007
5ea542b08b fix: Do not show Project, Cost Center and Accounting Dimension in ref doc 2019-07-13 11:39:32 +05:30
Deepesh Garg
74e0f2cbae Merge pull request #18293 from nabinhait/taxes-calc-only-if-items-dev
fix: Calculate taxes and totals only if items added in transaction
2019-07-12 23:03:12 +05:30
Aditya Hase
7be89f232c fix(auto attendance): Prevent marking attendance for the ongoi… (#18298)
fix(auto attendance): Prevent marking attendance for the ongoing shift
2019-07-12 21:38:59 +05:30
Rucha Mahabal
0fe37fda09 codacy fixes 2019-07-12 17:47:32 +05:30
Rucha Mahabal
4879e00d64 codacy fixes 2019-07-12 16:09:32 +05:30
Shivam Mishra
5594ea5298 Merge branch 'develop' into remove-move-stock-summary 2019-07-12 16:04:12 +05:30
karthikeyan5
625ec43fc9 fix(auto attendance): Prevent marking attendance for the ongoing shift 2019-07-12 15:57:37 +05:30
Rucha Mahabal
c35a9a4888 codacy fixes 2019-07-12 15:49:05 +05:30
Rohit Waghchaure
8412f847d4 fix: dr / cr label for balance of the ledgers in the account tree 2019-07-12 15:44:58 +05:30
Deepesh Garg
397013ec92 fix: Fix for customer lead merging in Quotation (#18294) 2019-07-12 14:51:01 +05:30
Rucha Mahabal
7396bb8933 codacy fixes 2019-07-12 14:47:02 +05:30
Deepesh Garg
ed9ac14f70 fix: Usability fixes for chart of Accounts Importer (#18285)
* fix: Usablity fixes for chart of Accounts Importer

* fix: Provide Row no with error messages
2019-07-12 14:47:00 +05:30
Deepesh Garg
d73426a3bc fix: Add status field at parent level in quality inspection and minor UX fix (#18263)
* fix: Add status field at parent level and minor UX fix

* fix: Set default status as Accepted
2019-07-12 14:44:22 +05:30
Rucha Mahabal
2b7064a348 codacy fixes 2019-07-12 14:34:43 +05:30
Nabin Hait
b315acb5a7 fix: Calculate taxes and totals only if items added in transaction 2019-07-12 14:32:53 +05:30
Anurag Mishra
70dbca2263 fix: enable track changes for issue doctype (#18290) 2019-07-12 14:29:20 +05:30
Deepesh Garg
f9e4391998 Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop
feat: "Order Type" tree type for Sales Analytics report (develop)
2019-07-12 14:28:16 +05:30
Deepesh Garg
49c97922b4 Merge pull request #18189 from bhavishyasharma/feat-manufacturer-is-missing-contacts
feat: Manufacturer is Missing Contacts
2019-07-12 14:01:00 +05:30
Rucha Mahabal
9e35bff55c feat: Email Campaign 2019-07-12 13:56:36 +05:30
Rushabh Mehta
64897d26a4 fix(minor): open colour status for issue 2019-07-12 12:55:28 +05:30
Deepesh Garg
587bdf09eb Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 12:30:42 +05:30
Deepesh Garg
f7c151e7ba Merge pull request #18241 from scmmishra/cash-flow-chart
feat: added chart to cash-flow report
2019-07-12 12:30:18 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972)
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
2019-07-12 12:28:34 +05:30
Deepesh Garg
91417646b1 Fix: Add fieldtype as currency 2019-07-12 12:24:05 +05:30
Himanshu
7d1d9aa46b feat(Issue): Reset SLA (#18244)
* feat: reset sla

* fix: db.get_single_value

* feat: timeline entry for reset sla

* fix: remove communication from support config

* fix: reset sla on split_issue
2019-07-12 12:19:35 +05:30
Suraj Shetty
ca872381a1 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-07-12 12:13:09 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
Suraj Shetty
32371c8755 feat: Init Pick Ticket and Pick Ticket Item 2019-07-12 11:56:42 +05:30
rohitwaghchaure
9b34eab93a Merge pull request #18258 from Mangesh-Khairnar/purchase-order-tax-category
feat(purchase-order): Add tax category field in purchase order
2019-07-12 11:39:35 +05:30
Saurabh
acaf76a6de Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 11:10:12 +05:30
Saurabh
98d429d271 Merge pull request #18239 from netchampfaris/breadcrumbs-module-map-2
fix: Add module map for breadcrumbs
2019-07-12 11:09:20 +05:30
Deepesh Garg
abd4a7a950 Merge pull request #18253 from frappe/jigneshpshah-Report-link
fix: navigation link updated for Item Shortage Report
2019-07-11 22:22:54 +05:30
Aditya Hase
d02c8ad898 fix: Quickbooks Migrator (#18259)
fix: Quickbooks Migrator
2019-07-11 20:27:00 +05:30
Aditya Hase
f04b19aa2e fix: Company might not have any warehouses when on_update hook for QBM is being executed
This used to throw while renaming a Company that is either used with QuickBooks
Migrator or is set as a Default Company in Global Defaults.
2019-07-11 18:29:24 +05:30
Mangesh-Khairnar
f8c92f30bf feat(purchase-order): Add tax category field in purchase order 2019-07-11 18:27:49 +05:30
Aditya Hase
d4c10801d1 style: Remove multiple whitespace after : 2019-07-11 18:17:01 +05:30
Aditya Hase
7352227a24 fix: Remove unused local variable 2019-07-11 18:16:42 +05:30
Aditya Hase
2f6cd1999a style: One import per line 2019-07-11 18:16:23 +05:30
Aditya Hase
9f40ffcd1e style: Insert whitespace after , 2019-07-11 18:10:05 +05:30
Aditya Hase
dfeb6bef8c style: Remove whitespace before : 2019-07-11 18:08:46 +05:30
Aditya Hase
6bbb726769 fix: Remove unused imports 2019-07-11 18:04:41 +05:30
Nabin Hait
bd055a858c fix: UX fixes in loan (#18220)
* fix: UX fixes in loan

* Update loan.py
2019-07-11 17:18:00 +05:30
Rushabh Mehta
af88e15e92 fix(patch): set_priority_for_support.py (#18255) 2019-07-11 17:14:29 +05:30
rohitwaghchaure
b390b70ee3 fix: set project in material request when pull items from bom (#18256) 2019-07-11 15:22:03 +05:30
Suraj Shetty
ef1d0d1d14 Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-11 15:02:42 +05:30
Nabin Hait
fca86c48c8 fix: Revert #frappe/erpnext/17896 (#18251) 2019-07-11 14:39:24 +05:30
Jignesh Greycube
870cbad5b2 fix: navigation link updated for Item Shortage Report
Item Shortage Report navigation link was incorrect , hence updated.
2019-07-11 13:56:43 +05:30
Himanshu
c32e287441 Merge pull request #18252 from hrwX/indi-fix
fix(Issue): resolution by indicator
2019-07-11 07:55:28 +00:00
Himanshu Warekar
523d0ab0d4 fix: resolution by indicator 2019-07-11 13:24:28 +05:30
Suraj Shetty
bc2ff785f1 fix: Restore "allow delivery" condition checks (#18246)
* fix: Remove `allow_delivery` flag

- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated

* fix: Restore allow_delivery condition checks
2019-07-11 10:43:40 +05:30
Suraj Shetty
c6c6b05522 fix: update_due_date_in_gle patch (#18248) 2019-07-11 10:42:37 +05:30
Shivam Mishra
020f405367 Merge branch 'develop' into cash-flow-chart 2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f fix(sales-invoice): get items from quotation (#18237) 2019-07-11 10:04:46 +05:30
rohitwaghchaure
4870e95b83 fix: po, rate set as zero against the item (#18242) 2019-07-11 10:03:35 +05:30
Deepesh Garg
8457fcf0c4 Merge pull request #18243 from deepeshgarg007/cash_flow
fix: Add missing Cost Centre filter in cash flow statement
2019-07-11 08:20:02 +05:30
deepeshgarg007
285701d9f1 fix: Add missing Cost Center filter in cash flow statement 2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f feat: added chart to cash-flow report 2019-07-10 20:28:52 +05:30
Suraj Shetty
7391054603 Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-10 19:39:56 +05:30
Suraj Shetty
7837fbe231 style: Add missing semicolon 2019-07-10 19:39:40 +05:30
Mangesh-Khairnar
d749f20f63 fix: installation note (#18232) 2019-07-10 19:29:39 +05:30
Faris Ansari
a7a6987c42 fix: Add Shopping Cart and Contacts 2019-07-10 19:27:57 +05:30
Faris Ansari
ab46f0f5bb fix: Add module map for breadcrumbs 2019-07-10 19:27:44 +05:30
Don-Leopardo
365a572073 Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-10 10:52:59 -03:00
Don-Leopardo
93fbba4f40 Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-07-10 10:52:55 -03:00
Himanshu
e7bb54ed76 feat(Issue): Settings to stop SLA tracking (#18112)
* fix: fix msgprint when creating new issues

* fix: use getdate

* fix: do not self save

* fix: test case

* fix: error due to comparing date and str

* fix: creation time for replicated issue

* feat: sla in support settings

* fix: remove sla settings

* feat: enable check in sla

* fix: throw if sla is disabled

* fix: enable sla
2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347 fix: Make material request against SO only for pending qty (#18216) 2019-07-10 17:05:49 +05:30
Suraj Shetty
61d8088be4 fix: Return fieldtype so that the client-side can format chart values (#18211) 2019-07-10 17:05:25 +05:30
rohitwaghchaure
058787d204 fix: error report for item price (#18212) 2019-07-10 17:03:48 +05:30
Mangesh-Khairnar
3d28c065db fix(exchange-rate-revaluation): change create to view button on creation of journal entry (#18201) 2019-07-10 17:03:23 +05:30
deepeshgarg007
1dc124cf75 fix: Changed columns to new dict form 2019-07-10 14:49:25 +05:30
Rucha Mahabal
191a0bd43c merged 2019-07-10 12:27:13 +05:30
Suraj Shetty
838697261d fix: Call popup avatar
Avoid getting session users image if customer doc has no image
2019-07-10 10:39:43 +05:30
Shivam Mishra
0b00b6af98 Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary 2019-07-10 10:32:45 +05:30
Shivam Mishra
eb7c037bdf Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary 2019-07-10 10:22:20 +05:30
Shivam Mishra
444091b350 refactor: disable quick entry for batched and serialized items 2019-07-10 10:22:08 +05:30
Deepesh Garg
62911ec198 Merge pull request #18206 from Anurag810/sending_sms_from_quotation
fix: sending sms from quotation
2019-07-10 09:18:43 +05:30
Anurag Mishra
e9dd9b842e Update erpnext/public/js/sms_manager.js
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-07-09 17:54:00 +05:30
Deepesh Garg
d1be5d0f55 Merge pull request #18207 from deepeshgarg007/dimension-filter-fix
fix: Tree filter fixes for accounting dimensions
2019-07-09 17:02:43 +05:30
deepeshgarg007
890ea195f3 fix: Tree filter fixes for erpnext dimensions 2019-07-09 16:56:56 +05:30
Rucha Mahabal
8c747ce5cf merged 2019-07-09 15:18:45 +05:30
Rucha Mahabal
36963a8e04 feat: Email Campaign 2019-07-09 15:14:13 +05:30
Anurag Mishra
de13faf19a fix: sending sms from quotation 2019-07-09 14:27:20 +05:30
Raffael Meyer
59cee369ce add header row 2019-07-08 14:48:54 +02:00
Mangesh-Khairnar
6a7969117f fix(bom): escape name with wildcard character (#18164) 2019-07-08 10:40:40 +05:30
Rushabh Mehta
8309fcfbbc BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059)
* BREAKING CHANGE: Remove anti-pattern "Project Task"

* fix(tests): remove `tasks` from project/test_records.json

* fix(tests)

* fix(test): test_employee_onboarding.py

* fix(tests): test_expense_claim.py

* fix(refactor): cleanup project.py validate/update

* fix(refactor): cleanup project.py validate/update

* fix(test): test_expense_claim

* fix(test): test_expense_claim

* fix(test): test_expense_claim, try Test Company 4

* Update project.py
2019-07-08 10:39:30 +05:30
Suraj Shetty
bef897602d fix: Use db_set since it triggers on_update event (#18175) 2019-07-08 10:30:26 +05:30
rohitwaghchaure
d86f027ce0 fix: default supplier was not set from the patch in item defaults for multi company instance (#18178) 2019-07-08 10:29:26 +05:30
rohitwaghchaure
334335a2ef fix: not able to make credit note for the sales invoice in which item code is not set (#18184) 2019-07-08 10:26:29 +05:30
Himanshu
35f15148fb fix: do not update modified (#18193) 2019-07-08 10:25:28 +05:30
Deepesh Garg
f753191fdf Merge pull request #18195 from deepeshgarg007/b2cs_json
fix: GSTR-1 B2CS JSON file generation and cess amount fixes
2019-07-08 10:10:52 +05:30
Deepesh Garg
6252c0490a Merge pull request #18194 from deepeshgarg007/dimensions_reports
fix: Add accounting dimensions to various reports and fixes
2019-07-07 22:40:57 +05:30
Mangesh-Khairnar
afa9cae711 Merge pull request #17459 from rohitwaghchaure/handle_large_outstanding_invoices_code_refactored
feat(payment-entry): handle fetch operation of a large number of outstanding invoices
2019-07-07 22:24:27 +05:30
deepeshgarg007
6bb5ade667 fix: Add accounting dimensions to various reports and fixes 2019-07-07 21:24:45 +05:30
Mangesh-Khairnar
48d61fb072 Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored 2019-07-07 20:17:07 +05:30
deepeshgarg007
7ce199807c fix: GSTR-1 B2CS Json file generation and cess amount fixes 2019-07-07 14:25:08 +05:30
rohitwaghchaure
8a054e4b36 Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
Bhavishya Sharma
607611ebdc codacy fix 2019-07-06 15:02:57 +05:30
Bhavishya Sharma
db3c5625ae feat: Manufacturer is Missing Contacts 2019-07-06 13:54:30 +05:30
rohitwaghchaure
94b3dd1db2 Merge pull request #18154 from netchampfaris/fix-price-list-on-website-d
fix: Honor price list in Shopping Cart Settings
2019-07-05 18:14:45 +05:30
rohitwaghchaure
6b2075a115 Merge pull request #18161 from deepeshgarg007/additional_discount
fix: Additonal discount not getting set in sales transactions
2019-07-05 18:13:23 +05:30
rohitwaghchaure
6ea1f7becf Merge pull request #18177 from scmmishra/po-patch-1
refactor: added throw if supplier is not default for any item
2019-07-05 18:12:56 +05:30
rohitwaghchaure
d8196ced76 Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 17:28:50 +05:30
Rohit Waghchaure
5d4d70b75f feat: provision to make debit / credit note against the stock returned entry 2019-07-05 17:06:25 +05:30
Deepesh Garg
1640e7012b Merge pull request #18172 from karthikeyan5/develop-terms-selling-buying-filter
feat(setup): adding selling buying filter in terms and conditions
2019-07-05 16:03:16 +05:30
Shivam Mishra
6277966105 chore: added check for auto-reorder in stock settings (#18174)
* chore: added check for auto-reorder in stock settings

* style: removed explicit return
2019-07-05 15:58:13 +05:30
Mangesh-Khairnar
ee01ba5879 fix: linting 2019-07-05 15:21:45 +05:30
Rohit Waghchaure
909d773462 fix: on credit note / debit note deferred reversed instead of income 2019-07-05 15:12:14 +05:30
Rohit Waghchaure
0f065d5de1 Added due date in the gl entry 2019-07-05 14:54:15 +05:30
Rohit Waghchaure
2f3f7507c4 fix: browser hangs while making payment entry for large number of outstaning invoices 2019-07-05 14:38:46 +05:30
Suraj Shetty
83f767b5a3 Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards
feat(manufacturing): added dashboard for doctypes
2019-07-05 14:22:13 +05:30
Govind S Menokee
473a5477b6 Merge pull request #3 from kaynes-technology/develop
Merge develop
2019-07-05 13:33:25 +05:30
Govind S Menokee
f3da32db22 Merge pull request #2 from frappe/develop
Merge official erpnext
2019-07-05 13:13:10 +05:30
Shivam Mishra
7a7c66e95e refactor: added throw if supplier is not default for any item 2019-07-05 13:06:53 +05:30
karthikeyan5
82e2bac891 fix(coding style): adding a few spaces 2019-07-05 12:41:19 +05:30
rohitwaghchaure
7fd503b5ba Merge pull request #18176 from rohitwaghchaure/remove_item_manufacturer_from_item_master
fix: removed item manaufacturer child table from item master
2019-07-05 12:25:05 +05:30
Rohit Waghchaure
cdb75b56c5 fix: removed item manaufacturer child table from item master 2019-07-05 12:24:14 +05:30
karthikeyan5
ad33c19510 fix: converting spaces to tabs on a few lines 2019-07-05 11:28:59 +05:30
Shivam Mishra
aea2b64fd0 Merge branch 'develop' into remove-move-stock-summary 2019-07-05 10:39:27 +05:30
Shivam Mishra
38b930b638 refactor: Move and Add buttons open new stock entry 2019-07-05 10:38:48 +05:30
karthikeyan5
830f2b642b chore(manufacturing): added dashboard for doctypes 2019-07-05 09:48:38 +05:30
karthikeyan5
7fc6021ca5 feat(setup): adding selling buying filter in terms and conditions 2019-07-04 22:46:16 +05:30
rohitwaghchaure
2f67fb25a6 Merge pull request #18168 from netchampfaris/stock-validation-message
fix: Add links in validation message
2019-07-04 19:13:08 +05:30
rohitwaghchaure
03db4c0efc Merge pull request #18166 from netchampfaris/send-sms-bom
fix: Don't show Send SMS in BOM
2019-07-04 19:11:42 +05:30
rohitwaghchaure
c1535a5542 Merge pull request #18167 from netchampfaris/manufacturing-module-sections
fix(UX): Move Bill of Materials section to first
2019-07-04 19:11:08 +05:30
Faris Ansari
23c80658ba fix: Add links in validation message 2019-07-04 18:54:04 +05:30
Faris Ansari
2b969a469a fix: Build item cache in long worker (#18165) 2019-07-04 18:52:32 +05:30
Faris Ansari
1d3008750c fix(UX): Move Bill of Materials section to first 2019-07-04 17:53:10 +05:30
Faris Ansari
a5d975d867 fix: Don't show Send SMS in BOM 2019-07-04 17:47:28 +05:30
Aditya Hase
31394ec9b0 fix: Revert unintentional commits (#18162)
fix: Revert unintentional commits
2019-07-04 16:53:46 +05:30
Aditya Hase
e5dc834ddb Revert "fix: Try Faster Travis"
This reverts commit 95054a5a02.
2019-07-04 16:52:01 +05:30
Aditya Hase
d7291dbcad Revert "fix: Send"
This reverts commit 697f995b27.
2019-07-04 16:51:53 +05:30
Aditya Hase
697f995b27 fix: Send 2019-07-04 16:19:22 +05:30
Aditya Hase
95054a5a02 fix: Try Faster Travis 2019-07-04 16:14:22 +05:30
deepeshgarg007
a9ea49c976 fix: Additonal discount not get set in sales transactions 2019-07-04 15:56:34 +05:30
Shivam Mishra
e528b29eea Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary 2019-07-04 13:46:30 +05:30
Mangesh-Khairnar
29734dae18 patch: reloads newly created docs in v12 (#18148) 2019-07-04 12:50:16 +05:30
Mangesh-Khairnar
100af0a635 fix(salary-slip): Nonetype error on amount calculation (#18147)
* fix: amount calculation

* Update salary_slip.py
2019-07-04 12:29:26 +05:30
Anurag Mishra
bdec7fea82 feat: purchase order against sales order (#17975)
* feat: purchase order against sales order

* fix: remove unwanted checks

* fix:Related tests
2019-07-04 12:28:01 +05:30
Nabin Hait
7b684a01d3 fix: merge conflict 2019-07-04 12:06:50 +05:30
Mangesh-Khairnar
359a73e1aa fix: invoice cancellation (#18152) 2019-07-04 11:37:20 +05:30
rohitwaghchaure
ca9d13cc9b Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-04 00:48:57 +05:30
Deepesh Garg
a37c51f93e Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
fix: Add filters for accounting dimensions in trial balance report
2019-07-03 22:00:25 +05:30
rohitwaghchaure
465196b0c7 Merge pull request #18155 from scmmishra/accounts-rec-report
fix: format values for charts
2019-07-03 19:26:08 +05:30
Faris Ansari
76afcf4cba fix: Honor price list in Shopping Cart Settings 2019-07-03 19:23:12 +05:30
Shivam Mishra
bb02c5105e fix: format values for charts 2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a fix: Add filtesr for accounting dimensions in trial balance report 2019-07-03 18:08:41 +05:30
Deepesh Garg
e5f8d24ead Merge pull request #18034 from rohitwaghchaure/payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
feat: payment reconciliation enhancements
2019-07-03 17:46:00 +05:30
Shivam Mishra
7dedd9a8cd refactor: better error message when changing variant value (#18144) 2019-07-03 17:29:29 +05:30
Don-Leopardo
85e2fd965a Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-03 08:15:08 -03:00
Deepesh Garg
af4f7b4ea1 Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss 2019-07-03 16:31:48 +05:30
Deepesh Garg
55fbddbee6 Add missing semicolon 2019-07-03 16:31:06 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143)
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Deepesh Garg
824ad34270 Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss 2019-07-03 13:28:49 +05:30
Deepesh Garg
8929c62113 Merge pull request #18145 from deepeshgarg007/gstr-itc-rev
fix: Multiple fixes in GSTR-3b Report
2019-07-03 13:11:14 +05:30
Mangesh-Khairnar
80fb0bf520 fix: add employee leave balance report to the dashboard 2019-07-03 13:06:46 +05:30
Deepesh Garg
0891728705 Merge pull request #18142 from frappe/surajshetty3416-patch-1
refactor: Remove an unwanted debug flag
2019-07-03 12:18:30 +05:30
Mangesh-Khairnar
8d19faa598 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-03 11:44:00 +05:30
rohitwaghchaure
f078031c60 fix: multiple minor issues in delayed order report (#18134) 2019-07-03 11:43:38 +05:30
Mangesh-Khairnar
0d4db95d99 fix: skip expired leaves on allocation end date 2019-07-03 11:35:51 +05:30
Deepesh Garg
1a6bfe986e Merge pull request #18113 from deepeshgarg007/gstr1-total
fix: Add total row in GSTR-1 report
2019-07-03 11:12:43 +05:30
Suraj Shetty
247d50e552 refactor: Remove unwanted debug flag 2019-07-03 10:47:35 +05:30
Nabin Hait
34c551d9a5 fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Mangesh-Khairnar
7763d0a059 Merge pull request #18139 from deepeshgarg007/travix-fix-erpnext
fix: Travis
2019-07-02 23:54:27 +05:30
Don-Leopardo
46b21f88e1 Merge branch 'develop' into fix_by_voucher_order_develop 2019-07-02 14:03:45 -03:00
deepeshgarg007
723e76f2ac fix: fix for test test_contact_search_in_foreign_language 2019-07-02 21:01:57 +05:30
Deepesh Garg
f866020f26 Merge branch 'develop' into gstr1-total 2019-07-02 19:59:53 +05:30
deepeshgarg007
3a83c7bd7d fix: Multiple fixes in GSTR-3b Report 2019-07-02 19:56:33 +05:30
Nabin Hait
05fee62314 fix: inv status 2019-07-02 17:55:26 +05:30
Nabin Hait
3bbcd491e4 fix: set invoice status considering invoice discounting 2019-07-02 15:31:24 +05:30
Nabin Hait
126a02e208 fix: set invoice status considering invoice discounting 2019-07-02 15:28:57 +05:30
Rohit Waghchaure
09b44345df fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table 2019-07-02 15:18:02 +05:30
Frappe PR Bot
f773c8e8a3 feat: Updated translation (#18125) 2019-07-02 10:14:53 +05:30
Mangesh-Khairnar
98409159c8 Merge pull request #18120 from Mangesh-Khairnar/fix-leaderboard
fix: leaderboard charts
2019-07-02 10:13:15 +05:30
Deepesh Garg
78a86af7fd fix: Fiter passing fix in get batch query (#18131) 2019-07-02 10:10:55 +05:30
rohitwaghchaure
f949c5ddf7 Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25 fix: incorrect value booked in the accumulated depreciation account on sell of the asset 2019-07-01 20:47:35 +05:30
Aditya Hase
8d70073cf8 refactor: Remove implicit auto assignment feature (#18124)
This behaviour now can be replicated with Assignment Rule configurations.
2019-07-01 19:35:17 +05:30
Mangesh-Khairnar
fc3731f15e Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix
fix: clear duplicates in mapped doc
2019-07-01 17:04:12 +05:30
Faris Ansari
8d2c996b50 feat: Call Popup and Exotel Integration (#17763)
feat: Call Popup and Exotel Integration
2019-07-01 16:36:32 +05:30
Shivam Mishra
43cebdff4d fix: translated title (#18119) 2019-07-01 11:01:28 +00:00
Nabin Hait
659a01d819 Update accounts_controller.py 2019-07-01 15:16:49 +05:30
Deepesh Garg
71359cc18b Merge branch 'develop' into gstr1-total 2019-07-01 14:49:59 +05:30
Suraj Shetty
8e65d5bd5b chore: Delete unwanted files 2019-07-01 14:32:29 +05:30
Suraj Shetty
b2e321686d Merge branch 'develop' into call-summary-dialog 2019-07-01 14:29:49 +05:30
Suraj Shetty
56242a5077 Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-07-01 14:29:05 +05:30
Suraj Shetty
502565ff56 fix: Make required changes 2019-07-01 14:28:59 +05:30
Mangesh-Khairnar
4aed7cc310 Merge branch 'develop' into mapped_doc_fix 2019-07-01 13:40:52 +05:30
rohitwaghchaure
c77bd82083 Merge pull request #18118 from rohitwaghchaure/asset_staus_not_showing_in_the_listview
fix: asset status not showing in the list view
2019-07-01 13:32:39 +05:30
Deepesh Garg
0cdf55033a Merge branch 'develop' into gstr1-total 2019-07-01 12:36:35 +05:30
Rohit Waghchaure
7729fcea19 fix: asset status not shwoing in the list view 2019-07-01 12:26:34 +05:30
Mangesh-Khairnar
9955b189e4 fix: leaderboard chart 2019-07-01 12:20:09 +05:30
rohitwaghchaure
9c1dbc5e39 Merge pull request #18117 from rohitwaghchaure/accounts_receivable_not_working_if_company_not_selected
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 12:05:14 +05:30
Rohit Waghchaure
2fa6224f8f fix: accounts receivable / payable not working if the company is not seletced in filter 2019-07-01 11:55:12 +05:30
Suraj Shetty
edee06fc90 Merge branch 'develop' into call-summary-dialog 2019-07-01 11:05:59 +05:30
Himanshu
2d0fd9f519 fix: travis (#18116) 2019-07-01 10:24:02 +05:30
Suraj Shetty
1431bf2a3c fix: User cannot create call log 2019-07-01 09:10:23 +05:30
Rucha Mahabal
162f7d1b50 auto email and new communication linked to email campaign setup 2019-07-01 01:09:58 +05:30
deepeshgarg007
cef54ae3c2 fix: Add total row in GSTR-1 report 2019-06-30 19:49:26 +05:30
Rucha Mahabal
dcf5fbd35d added some validations 2019-06-30 16:36:09 +05:30
Rucha Mahabal
fc03509e46 created data structure for email automation 2019-06-30 16:24:29 +05:30
Suraj Shetty
a7d618cce0 Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-30 15:33:23 +05:30
Suraj Shetty
19e4fde737 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-30 15:30:59 +05:30
rohitwaghchaure
4c2eb0f13b Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
fix: finance book filters includes the gl data which don't have finance book
2019-06-29 15:06:34 +05:30
rohitwaghchaure
ada1e4f0c4 Merge pull request #17962 from rohitwaghchaure/not_able_to_save_asset_for_manual_method_develop
fix: not able to save asset if depreciation method is manual
2019-06-29 15:05:46 +05:30
Govind S Menokee
a596a7fd2b feat: Add batch operation times in BOM Operation 2019-06-29 04:08:26 +05:30
Don-Leopardo
b2b5c3ac0a Merge branch 'develop' into fix_by_voucher_order_develop 2019-06-28 19:36:25 -03:00
Govind S Menokee
65633e01b8 Merge pull request #1 from frappe/develop
Merge Official Develop
2019-06-29 04:04:59 +05:30
Himanshu Warekar
115da67713 fix: include standalone sla in issues 2019-06-28 22:26:58 +05:30
Himanshu
a917bec8da Merge branch 'develop' into mapped_doc_fix 2019-06-28 19:46:00 +05:30
Himanshu
0aa4e40edf Merge pull request #18105 from hrwX/issue-fix
fix: remove frm call for priority change
2019-06-28 19:44:41 +05:30
Himanshu Warekar
0611078483 Merge branch 'issue-fix' of https://github.com/hrwx/erpnext into issue-fix 2019-06-28 19:41:45 +05:30
Himanshu Warekar
bc0bc6677e fix: use db sql to delete property setter 2019-06-28 19:41:29 +05:30
Himanshu
9c207e1520 Merge branch 'develop' into issue-fix 2019-06-28 19:36:36 +05:30
Mangesh-Khairnar
e493490702 fix: mapped doc 2019-06-28 19:22:51 +05:30
Himanshu Warekar
c163b0de3d Merge branch 'develop' of https://github.com/frappe/erpnext into issue-fix 2019-06-28 19:08:08 +05:30
Himanshu Warekar
5cec89d1ab fix: remove frm call for priority change 2019-06-28 19:07:13 +05:30
rohitwaghchaure
42c8a4baa0 Merge pull request #18102 from adityahase/fix-buying-develop
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
2019-06-28 14:44:21 +05:30
Aditya Hase
d825ee57b7 fix(buying): Translate label for "Supplier Addresses And Contacts" Report 2019-06-28 14:40:59 +05:30
Himanshu
ea4c42d47b fix(Utils): Do not add duplicate items (#17896)
* fix: do not add duplicate items

* Update erpnext/public/js/utils.js

Co-Authored-By: Rohan <Alchez@users.noreply.github.com>

* fix: compare warehouses, batch and qty for an item

* fix: code fixes

* Update utils.js

* fix: check required_date and delivery_date

* Update utils.js

* fix: mixed tabs and spaces
2019-06-28 14:13:13 +05:30
Deepesh Garg
fb29ffc90c fix: Usability fixes to Serial No and batch selector (#18071)
* fix: Usability fixes to Serial No and batch selector

* fix: Codacy

* Update sales_common.js
2019-06-28 14:08:08 +05:30
Frappe PR Bot
a15d100cbd feat: Updated translation (#17954) 2019-06-28 13:05:19 +05:30
KanchanChauhan
2433fb1596 feat: Terms and Conditions section in Blanket Order (#17991) 2019-06-28 12:54:12 +05:30
Deepesh Garg
dbe9a41389 feat: Confirmation to submit material request against Production Plan (#18062)
* feat: Confirmation to submit material request against Production Plan

* fix: Test cases for production plan

* fix: Test Cases for production plan
2019-06-28 12:48:28 +05:30
Nabin Hait
f5aff98589 fix: Validate changes in batch, serial nos, val method fields (#18064) 2019-06-28 12:47:44 +05:30
Karthikeyan S
e6236094a6 fix(item): fix patch for barcode childtable migration in item (#18069)
* fix(item): fix patch for barcode childtable migration in item

(cherry picked from commit b2c43ee2d9)

* fix(item): fixing broken patch item_barcode_childtable_migrate

(cherry picked from commit beca677276)
2019-06-28 12:46:42 +05:30
rohitwaghchaure
9dd7d3ebb3 fix: not able to make salary slip based on timesheet (#18088) 2019-06-28 12:40:52 +05:30
Mangesh-Khairnar
4000fb5bb8 fix: add a more descriptive message when no records are found (#18082)
* fix: add a more descriptive message when no records are found

* fix: translation by passing string to translation function
2019-06-28 12:38:40 +05:30
Don-Leopardo
c3f6bed650 Merge branch 'develop' into fix_by_voucher_order_develop 2019-06-27 18:09:19 -03:00
Don-Leopardo
a01d0a5311 Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-06-27 18:09:09 -03:00
Himanshu
130dcffcc8 Merge pull request #18099 from hrwX/issue_fix
fix: Remove whitelisted method
2019-06-28 00:02:01 +05:30
Himanshu Warekar
43e3dacba2 fix: remove whitelisted method 2019-06-28 00:00:48 +05:30
Himanshu
152efd2be5 Merge pull request #18098 from hrwX/patch
fix: change to link field in Issue WebForm
2019-06-27 23:01:36 +05:30
Himanshu Warekar
be0001ece6 fix: change to link field 2019-06-27 22:59:52 +05:30
Aditya Hase
ce9cdfb056 fix(ui): better message after creating serial numbers (#18093)
fix(ui): better message after creating serial numbers
2019-06-27 18:20:13 +05:30
Aditya Hase
798528eaaa fix: set serial numbers as data field (#18094)
fix: set serial numbers as data field
2019-06-27 18:19:29 +05:30
Aditya Hase
7f3ebb1d06 Merge branch 'develop' into stock-ledger-link 2019-06-27 18:19:15 +05:30
Aditya Hase
b9c9ada3f8 Merge pull request #18090 from scmmishra/twelve-fixes
fix: print message for insufficient stock
2019-06-27 18:18:24 +05:30
Aditya Hase
a10912787c fix: styling for sort selector (#18092)
fix: styling for sort selector
2019-06-27 18:17:35 +05:30
Anurag Mishra
322eca61e6 fix: Wrong Casual Leave Opening in Employee Leave Balance Report
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
2019-06-27 17:00:55 +05:30
Shivam Mishra
c41403c8a9 fix: remove move and add buttons from stock summary 2019-06-27 16:34:38 +05:30
Shivam Mishra
0ec772194d Merge branch 'develop' into page-sort-selector 2019-06-27 15:38:18 +05:30
Shivam Mishra
eeeccdb6da Merge branch 'develop' into twelve-fixes 2019-06-27 15:37:58 +05:30
Shivam Mishra
0f67d22edd Merge branch 'develop' into stock-ledger-link 2019-06-27 15:37:44 +05:30
Rushabh Mehta
09fed465fb Merge pull request #18081 from Mangesh-Khairnar/fix-department
fix: open department in tree view via awesome bar
2019-06-27 15:02:53 +05:30
Shivam Mishra
468d5563c6 fix: set serial numbers as data field 2019-06-27 14:13:54 +05:30
Shivam Mishra
e1aec5519b fix(ui): better message after creating serial numbers 2019-06-27 13:14:41 +05:30
Shivam Mishra
bc777b1732 fix: styling for sort selector 2019-06-27 12:43:39 +05:30
Mangesh-Khairnar
3b60fac3b7 fix: open department in tree view via awesome bar 2019-06-27 11:43:22 +05:30
Shivam Mishra
9e07b7d2b8 Merge branch 'develop' into twelve-fixes 2019-06-27 09:44:41 +05:30
Himanshu
0b39c4ecff Merge pull request #17492 from hrwX/sla_fix
feat(Service Level Agreement): Service Level Agreement based on Customer, Group and Territory
2019-06-27 01:32:21 +05:30
Himanshu Warekar
5ebdf76669 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-27 01:29:25 +05:30
Himanshu Warekar
24b9d1e5a6 fix: patch fixes 2019-06-27 01:29:00 +05:30
Himanshu
6596f6e218 Merge branch 'develop' into sla_fix 2019-06-27 00:18:56 +05:30
rohitwaghchaure
5e299686be Merge pull request #18085 from rohitwaghchaure/fix_test_cases_for_sales_invoice_for_dn_develop
fix: dn test cases
2019-06-26 23:04:35 +05:30
Rohit Waghchaure
6de3ed5416 fix: dn test cases 2019-06-26 21:58:42 +05:30
Himanshu
27c1e844c7 Merge branch 'develop' into sla_fix 2019-06-26 18:24:29 +05:30
Faris Ansari
50644b5315 fix: Allow Rename in Issue Type (#18079)
fix: Allow Rename in Issue Type
2019-06-26 17:51:30 +05:30
Faris Ansari
df7a6520b9 fix: Allow Rename in Issue Type 2019-06-26 16:57:33 +05:30
Himanshu
b134709aaf Merge branch 'develop' into sla_fix 2019-06-26 16:36:51 +05:30
Karthikeyan S
48535e95e6 Fix(integrations): Adding Error Logs for Woocommerce (#18061)
(cherry picked from commit ae255d6328)
2019-06-26 13:41:49 +05:30
Karthikeyan S
51c600696e fix(README): broken link to 'Report Security Vulnerabilities' (#18063) 2019-06-26 13:41:00 +05:30
rohitwaghchaure
387ee8f511 fix: returned qty issue while making sales invoice from dn if same item added multiple times (#18076) 2019-06-26 13:40:26 +05:30
Rushabh Mehta
b8b506b105 Merge pull request #18072 from hrwX/att_gantt_fix_v12
fix(Attendance): Attendance gantt fix
2019-06-26 13:36:37 +05:30
Faris Ansari
2ab8d3ebcc fix: Move links to appropriate section (#17999)
* fix: Move links to appropriate section

* fix: New section Accounting Entries
2019-06-26 13:32:41 +05:30
Faris Ansari
fbc861320f fix: Don't append None values in against_account (#18031) 2019-06-26 13:31:31 +05:30
Anurag Mishra
0181eb0652 fix: removed unused function 2019-06-26 13:26:50 +05:30
Anurag Mishra
8a6255078b fix: wrong Casual Leave opening 2019-06-26 13:22:34 +05:30
Himanshu
9323c3ae29 Merge branch 'develop' into sla_fix 2019-06-26 12:54:08 +05:30
Himanshu Warekar
d48b2ac126 fix: attendance gantt fix 2019-06-26 11:37:49 +05:30
Mangesh-Khairnar
8c621ab90c fix: precision for certain calculations in buying controller (#18008)
* fix: precision for certain numbers

* fix: check precision of the received_qty

* Update buying_controller.py
2019-06-26 11:10:17 +05:30
Deepesh Garg
ea0574679f fix: Removed submitted status from Quotation (#18055)
* fix: Change in list view and status updater

* fix: Change status in doctype

* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Mangesh-Khairnar
07aae76bbf fix: change the department to tree view (#18057) 2019-06-26 11:03:57 +05:30
Nabin Hait
40d25f4010 fix: Show close button if per_ordered is less than 99.999999 (#18067) 2019-06-26 10:57:45 +05:30
Shivam Mishra
9479f7f1ef fix: print message for insufficient stock 2019-06-26 10:37:00 +05:30
rohitwaghchaure
b98e825ceb Merge pull request #18060 from adityahase/fix-sales-funnel
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 21:36:26 +05:30
Himanshu
bd3ccad513 Merge branch 'develop' into sla_fix 2019-06-25 21:14:52 +05:30
Aditya Hase
2caaa1b03d fix(sales-funnel): Remove duplicate code 2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc fix(sales-funnel): Use frappe.Chart() instead of Chart() 2019-06-25 17:07:41 +05:30
rohitwaghchaure
2b6cb6160f Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant
fix: Closed job opening disaplying in job applicant
2019-06-25 16:51:03 +05:30
Himanshu Warekar
6931ea68a2 Merge sla_fix into sla_fix 2019-06-25 16:27:58 +05:30
Himanshu Warekar
2373c095ed Merge develop into sla_fix 2019-06-25 16:27:06 +05:30
Himanshu Warekar
99d46844d5 fix: minor patch fix 2019-06-25 16:25:51 +05:30
rohitwaghchaure
f9de144f07 Merge pull request #18045 from deepeshgarg007/accounts_controller_develop
fix: Float division by zero error handling in group similar item
2019-06-25 15:25:42 +05:30
rohitwaghchaure
827ac1e291 Merge pull request #18040 from Mangesh-Khairnar/fix-price-list
fix(price list): change the field name
2019-06-25 15:23:44 +05:30
rohitwaghchaure
8aff023abe Merge pull request #18049 from deepeshgarg007/rounded_total_develop
fix: Currency symbol fix for rounded total
2019-06-25 15:14:34 +05:30
rohitwaghchaure
99ef523c9c Merge pull request #18017 from sahil28297/fix_bom_exploded_item
fix(BOM): set default value of include_exploded_item to "0"
2019-06-25 14:18:33 +05:30
sahil28297
b056595029 Merge branch 'develop' into fix_bom_exploded_item 2019-06-25 14:12:23 +05:30
Deepesh Garg
cc0bebacd2 Merge branch 'develop' into accounts_controller_develop 2019-06-25 13:15:42 +05:30
Himanshu
ce7603acc5 Merge branch 'develop' into sla_fix 2019-06-25 11:48:41 +05:30
rohitwaghchaure
07f9dbbf80 Merge pull request #18050 from rohitwaghchaure/revert_bom_recurrsion_changes
fix: revert changes of bom recursion
2019-06-25 07:12:51 +05:30
Rohit Waghchaure
a64e4037d2 fix: revert changes of bom recursion 2019-06-25 07:08:59 +05:30
deepeshgarg007
ab13192dd4 fix: Currency symbol fix for rounded total 2019-06-24 21:22:52 +05:30
Don-Leopardo
fb2a05cb3f Merge branch 'develop' into fix_by_voucher_order_develop 2019-06-24 11:29:28 -03:00
Don-Leopardo
54b9fd5bef Merge branch 'develop' into sales_analytics_with_order_type_develop 2019-06-24 11:29:23 -03:00
Himanshu
0e26deb463 Merge branch 'develop' into sla_fix 2019-06-24 19:30:36 +05:30
deepeshgarg007
e8d21cd8fa fix: Division by zero error fix in group similar item 2019-06-24 18:49:24 +05:30
Rohit Waghchaure
78d6086739 fix: Closed job opening disaplying in job applicant 2019-06-24 18:05:10 +05:30
rohitwaghchaure
55c9eb6d9e Merge pull request #18037 from rohitwaghchaure/bom_update_tool_optimization
fix: optimize bom update tool
2019-06-24 18:00:17 +05:30
Mangesh-Khairnar
558a5c199f fix(price list): change the field name 2019-06-24 17:32:04 +05:30
Faris Ansari
b99f53f410 Merge pull request #17517 from karthikeyan5/develop-biometric-attendance
feat(HR): Auto Attendance
2019-06-24 17:28:28 +05:30
NahuelOperto
42fe68d065 feat: order type in trr type filter 2019-06-24 08:29:14 -03:00
Himanshu Warekar
4538658d02 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-24 15:22:25 +05:30
Himanshu Warekar
54ece39aef fix: review changes 2019-06-24 15:18:56 +05:30
karthikeyan5
eadc144477 fix(HR): fixing bug introduced during merge conflict resolution.
> while merging with https://github.com/frappe/erpnext/pull/17837
2019-06-24 15:15:38 +05:30
karthikeyan5
82256bc58b fix(hr): Auto Attendance
> fixing minor bug in shift calculation
> adding 'Mark Auto Attendance' button in shift and related fixes
> changed employee checkin naming series
> added aditional validation for employee checkin
> added/updated dashboard for Attendance, Employee, Shift Type
2019-06-24 15:15:38 +05:30
karthikeyan5
32197355ad rename(HR): Employee Attendance Log DocType to Employee Checkin 2019-06-24 15:15:38 +05:30
karthikeyan5
e0c5176383 refactor(HR): Auto Attendance
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
2019-06-24 15:15:38 +05:30
karthikeyan5
66e459b35d fix(auto attendance): changes as requested in review
> removed unused field from shift assignment
> renamed 'biometric_rf_id' to 'attendance_device_id'
> added more test cases
> few other minor changes after demo
2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8 feat(HR): Auto Attendance
>Marking attendance based on Employee Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542 fix(HR): validations and bug fixes for Attendance Log 2019-06-24 15:15:38 +05:30
karthikeyan5
a4d0ba222b fix(HR): changes as per PR review
> renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType
> renamed biometric_id to biometric_rf_if
2019-06-24 15:15:38 +05:30
karthikeyan5
e4bbda6ff5 feat(HR): Added Employee CheckIn Log
> Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices.
>added biometric_id in the Employee Doctype
2019-06-24 15:15:38 +05:30
rohitwaghchaure
b8df611160 Merge pull request #18035 from rohitwaghchaure/fixed_test_case_for_payment_terms_in_so
fix: test case for payment terms in quotation
2019-06-24 15:14:51 +05:30
Rohit Waghchaure
1777e60dc2 fix: test case for payment terms in quotation 2019-06-24 14:11:06 +05:30
Rohit Waghchaure
d95909c39a fix: optimize bom update tool 2019-06-24 12:57:44 +05:30
Rohit Waghchaure
a2408a63da feat: payment reconciliation enhancements 2019-06-24 02:11:51 +05:30
Himanshu Warekar
3780508ec5 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-24 00:33:01 +05:30
Himanshu Warekar
de8c38f0fe fix: datetime import 2019-06-24 00:31:33 +05:30
Himanshu
3ec19b7afa Merge branch 'develop' into sla_fix 2019-06-23 23:22:53 +05:30
sahil28297
9a6517f8f0 fix(BOM): update modified field 2019-06-23 20:06:18 +05:30
Himanshu Warekar
d70c656142 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-21 22:57:34 +05:30
Himanshu Warekar
d1ca820e1e fix: add function for timedelta conversion 2019-06-21 22:57:06 +05:30
NahuelOperto
4448e2d66b fix order in general ledger 2019-06-21 08:50:37 -03:00
Sahil Khan
aef77058b6 fix(BOM): set default value of include_exploded_item to 0 2019-06-21 11:37:45 +05:30
Rushabh Mehta
41721fe1c3 Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO
fix: copy_payment_schedule_from_quot_to_SO
2019-06-21 09:19:20 +05:30
Aditya Hase
2f4f9a2af0 Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop 2019-06-21 06:11:13 +05:30
Mangesh-Khairnar
bd999b0908 fix: minor changes 2019-06-21 00:49:48 +05:30
Himanshu
c26ce5c506 Merge branch 'develop' into sla_fix 2019-06-20 23:58:08 +05:30
Himanshu Warekar
f5262c54ff Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-20 23:30:20 +05:30
Himanshu Warekar
9f19a82ec9 fix: scheduling bug if out of bussiness hours 2019-06-20 23:29:56 +05:30
Aditya Hase
9986155e8e chore: Python 3 Tests on Travis (#18012)
chore: Python 3 Tests on Travis
2019-06-20 22:53:23 +05:30
rohitwaghchaure
8b7267eb60 Merge pull request #17921 from Mangesh-Khairnar/expense-claim
feat: Tax based expense claim
2019-06-20 22:02:52 +05:30
Aditya Hase
d4aea67517 Merge branch 'develop' into py3-2 2019-06-20 21:22:24 +05:30
Aditya Hase
8c0e65cccc fix(test): Explicitly search for Material Request Item with Item Code (#18013)
fix(test): Explicitly search for Material Request Item with Item Code
2019-06-20 21:22:06 +05:30
Aditya Hase
c980143764 fix(test): Explicitly search for Material Request Item with Item Code 2019-06-20 21:15:55 +05:30
Aditya Hase
51eecd0c42 chore: Enable Flake 821 rule 2019-06-20 20:10:53 +05:30
Aditya Hase
700711c28d fix: Run script with bash 2019-06-20 20:10:53 +05:30
Aditya Hase
44da737c1b fix: Minor 2019-06-20 20:10:53 +05:30
Aditya Hase
c052ce61f7 fix: Set file permissions 755 on travis/run-tests.sh 2019-06-20 20:10:53 +05:30
Aditya Hase
bb5ca5a01f fix(py3): Convert filter to list 2019-06-20 20:10:53 +05:30
Aditya Hase
63ddff867a chore: Temporarily disable flake rule F821 2019-06-20 20:10:53 +05:30
Aditya Hase
f397acc936 fix(travis): Refactor .travis.yml 2019-06-20 20:10:53 +05:30
Aditya Hase
3fa112d8a7 feat(travis): Python 3.6 tests 2019-06-20 20:10:53 +05:30
Deepesh Garg
d11e481888 Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission
fix: Get Accounting Dimension only if user has read permission on it
2019-06-20 19:44:59 +05:30
rohitwaghchaure
d2061b44dd fix: could not find company all (#17978) 2019-06-20 19:13:54 +05:30
Deepesh Garg
23deb6f79b fix: Default cost center fix for delivery note item (#17990) 2019-06-20 19:11:58 +05:30
Suraj Shetty
01f56b867e fix: Return empty array to avoid failure 2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68 fix: Use can_read API 2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb Merge pull request #17998 from netchampfaris/app-logo-url
fix: App logo URL
2019-06-20 17:53:40 +05:30
Deepesh Garg
ffa4ba06ec Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes
fix: GST report fixes
2019-06-20 17:22:59 +05:30
Suraj Shetty
da629810ad fix: Get accounting dimensions only if user has access 2019-06-20 17:20:19 +05:30
deepeshgarg007
6ef38ebf34 fix: GSTR report fixes 2019-06-20 15:55:09 +05:30
deepeshgarg007
50f4fc48a5 fix: GSTR report fixes 2019-06-20 15:53:14 +05:30
deepeshgarg007
5ff830b6f4 fix: GSTR report fixes 2019-06-20 15:50:02 +05:30
deepeshgarg007
a8e49b8afd Revert "fix: GSTR-2 Report fixes"
This reverts commit a55413cb0d.
2019-06-20 15:26:04 +05:30
deepeshgarg007
7483cb49fe Revert "fix: GSTR-1 Report fixes"
This reverts commit 7592e0b588.
2019-06-20 15:25:06 +05:30
Rushabh Mehta
5162b7457f Merge pull request #17918 from Alchez/develop-item-code-gen
fix(stock): Remove hardcoded validation for Item
2019-06-20 14:21:57 +05:30
Mangesh-Khairnar
8619fc7413 fix: fetch rate only if field is empty 2019-06-20 12:02:47 +05:30
Himanshu
014dc1729d Merge branch 'develop' into sla_fix 2019-06-20 11:36:29 +05:30
Faris Ansari
23f9b6156f fix(Opportunity): Don't assign to Guest (#17996)
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
2019-06-20 11:34:14 +05:30
Himanshu Warekar
a1c1f74d84 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-20 11:33:06 +05:30
Himanshu Warekar
a03aa0014e feat: update sla using custom script 2019-06-20 11:32:49 +05:30
Aditya Hase
903d5201b4 fix(tests): Do not test order of features in Location (#17983)
fix(tests): Do not test order of features in Location
2019-06-20 11:29:59 +05:30
Himanshu
d82175da36 Merge branch 'develop' into sla_fix 2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef feat: change apply_to to entity 2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855 feat: filter sla based on customer in issue 2019-06-20 10:00:11 +05:30
Aditya Hase
d5cd0a05d0 fix(tests): Timesheet tests (#17982)
fix(tests): Timesheet tests
2019-06-20 09:40:56 +05:30
Aditya Hase
b96956f35c Merge branch 'develop' into fix-timesheet-tests 2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846 Merge pull request #17995 from deepeshgarg007/hsn_summary_develop
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 21:48:15 +05:30
Suraj Shetty
b9f346fc88 Merge branch 'develop' into call-summary-dialog 2019-06-19 19:18:52 +05:30
Faris Ansari
357592f55e fix: Remove logo replace logic 2019-06-19 19:17:50 +05:30
Faris Ansari
4a1c7ddb09 fix: App logo URL 2019-06-19 19:15:37 +05:30
Aditya Hase
6a40c491df Merge branch 'develop' into fix-location-tests 2019-06-19 18:50:00 +05:30
deepeshgarg007
ecc670047e fix: From date and to date filters in HSN wise summary of out ward supplies 2019-06-19 18:36:24 +05:30
Suraj Shetty
16baa3b13a fix: Move back .pylintrc to root 2019-06-19 18:35:36 +05:30
Suraj Shetty
d4420afb72 chore: Remove unwanted files 2019-06-19 18:33:56 +05:30
Deepesh Garg
2b739b304e Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application
fix(employee-benefit-application): remove query from setup
2019-06-19 18:18:47 +05:30
Mangesh-Khairnar
0ef1df72ad refactor: fetch rate directly from the account head 2019-06-19 17:50:33 +05:30
Himanshu
3caf7b80e5 Merge branch 'develop' into sla_fix 2019-06-19 16:08:35 +05:30
rohitwaghchaure
d849ce7ce0 Merge pull request #17980 from adityahase/fix-buying-items-rate
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
Himanshu Warekar
24cef8e26e Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-19 14:43:59 +05:30
Himanshu Warekar
36d6e570c4 patch: try catch to handle TableMissingError 2019-06-19 14:43:21 +05:30
rohitwaghchaure
40c5fcc9cc Merge pull request #17967 from Alchez/develop-delivery-email
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Himanshu
7bb1402a37 Merge branch 'develop' into sla_fix 2019-06-19 13:42:49 +05:30
Mangesh-Khairnar
439313e524 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465 fix: track status for pending leaves 2019-06-19 13:00:52 +05:30
Faris Ansari
2632107129 fix: User MultiSelectList control for Party filter (#17943)
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Himanshu Warekar
c86954ce9b Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-19 12:03:24 +05:30
Himanshu Warekar
f4f7e781c5 debug: travis 2019-06-19 12:01:59 +05:30
Himanshu
e3168b6117 Merge branch 'develop' into sla_fix 2019-06-18 23:40:55 +05:30
Aditya Hase
645afe16c3 fix(tests): Do not test order of features in Location 2019-06-18 23:01:20 +05:30
Aditya Hase
be8a46a92a fix(tests): Timesheet tests 2019-06-18 21:50:05 +05:30
Rohit Waghchaure
5f9793e081 fix: finance book filters includes the gl data which don't have finance book 2019-06-18 21:09:52 +05:30
Himanshu Warekar
2724de9320 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-18 20:02:26 +05:30
Himanshu Warekar
e48ca44bf5 patch: fix typo 2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6 patch: refactor patch for travis test 2019-06-18 19:35:50 +05:30
Aditya Hase
48585c94ff fix: Consider discount_amount only when provided to calculate rate
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.

All DocTypes on buying side have this bug.
2019-06-18 19:11:17 +05:30
Himanshu Warekar
befd393dcb fix: patch 2019-06-18 12:51:12 +05:30
rohitwaghchaure
226ff5a797 Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Suraj Shetty
5b52aba8df Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-18 11:28:20 +05:30
Suraj Shetty
a28b96493f fix: Make field labels translatable 2019-06-18 11:28:14 +05:30
Suraj Shetty
a367a85a78 Merge branch 'develop' into call-summary-dialog 2019-06-18 11:09:29 +05:30
Suraj Shetty
9ba9a91631 fix: Strip leading zero from phone number 2019-06-18 10:56:47 +05:30
Deepesh Garg
c38e0bb75c Merge pull request #17959 from deepeshgarg007/dimension-fixes
fix: Is group filter fixes in dimensions
2019-06-18 08:37:32 +05:30
Himanshu Warekar
7c18f69727 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-17 23:53:01 +05:30
Himanshu Warekar
0ad3887d51 patch: fixes 2019-06-17 23:52:53 +05:30
deepeshgarg007
946eefe039 fix: Codacy fixes 2019-06-17 23:10:36 +05:30
Mangesh-Khairnar
7293a98a10 fix: change formatting 2019-06-17 19:03:46 +05:30
Mangesh-Khairnar
9ee5c8a4c6 fix(employee-benefit-application): remove query from setup 2019-06-17 18:07:10 +05:30
Himanshu Warekar
bdf9737d73 patch: reload service level priority 2019-06-17 18:00:57 +05:30
Anurag Mishra
3d47a6dbb5 fix: Company filters in Total Stock Summary Report (#17965) 2019-06-17 17:49:04 +05:30
rohitwaghchaure
cfcf7ae7b6 Merge pull request #17960 from rohitwaghchaure/delayed_order_reports
feat: delayed order reports
2019-06-17 17:42:18 +05:30
Rohit Waghchaure
4803e817e9 fix: bank guarantee, not able to select the purchase order 2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351 fix(minor): format date in user format for accounting dashboard 2019-06-17 17:33:24 +05:30
rohitwaghchaure
fdb79063a0 Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 17:24:29 +05:30
Mangesh-Khairnar
7b2a2816cd Merge pull request #17950 from Anurag810/company_ui/ux_fix
fix: Make some section collapsible in company form
2019-06-17 17:00:00 +05:30
Rohit Waghchaure
7efeffa66a fix: allow edit is enabled in the pos profile still user not able to edit the rates 2019-06-17 16:20:32 +05:30
Rohan Bansal
4babfdb987 fix(delivery): Add more context for dispatch notification email + formatting fixes 2019-06-17 16:16:51 +05:30
Mangesh-Khairnar
57f4e817f8 Merge branch 'develop' into company_ui/ux_fix 2019-06-17 15:36:45 +05:30
deepeshgarg007
dfe006be19 Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes 2019-06-17 15:26:05 +05:30
Suraj Shetty
04d623ab66 fix: Get employee login ids directly from child table 2019-06-17 15:20:28 +05:30
Suraj Shetty
db26191937 Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-17 14:17:26 +05:30
Suraj Shetty
8b95b61aa0 fix: Remove unwanted code 2019-06-17 14:17:21 +05:30
Rohit Waghchaure
b5f94e5f71 fix: not able to save asset if depreciation method is manual 2019-06-17 13:34:44 +05:30
Faris Ansari
2e968ece1a Delete test_call_log.py 2019-06-17 13:03:44 +05:30
Faris Ansari
520c403a05 Delete call_log.js 2019-06-17 13:02:49 +05:30
Suraj Shetty
ec6afbbe99 Merge pull request #17953 from netchampfaris/website-theme-import
fix: Add erpnext website theme import
2019-06-17 12:56:24 +05:30
Rohit Waghchaure
725f56faca feat: delayed order reports 2019-06-17 12:50:44 +05:30
deepeshgarg007
d1e0f42fea fix: Styling fix 2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33 fix: Is group filter fixes in dimensions 2019-06-17 12:44:49 +05:30
Suraj Shetty
93fc6004ad Merge pull request #17942 from netchampfaris/product-page-cart-disabled
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82 Merge pull request #17951 from netchampfaris/product-page-specification
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30
Rohan Bansal
0426636a32 fix(customer): Improve performance by reducing queries 2019-06-17 12:16:12 +05:30
Himanshu Warekar
67f9b63793 patch: get priority before reload_doc 2019-06-17 11:49:02 +05:30
Suraj Shetty
340ccb6c96 fix: Remove unwanted code 2019-06-17 10:16:38 +05:30
Himanshu Warekar
199b43dbbb fix: patch fixes for sla 2019-06-17 09:35:34 +05:30
Suraj Shetty
a86a07ef37 fix: Add additional check to ensure doc_before save exists 2019-06-17 09:29:46 +05:30
Suraj Shetty
eb0ca67ced fix: Caller name in call popup 2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a fix: Decouple call popup from exotel 2019-06-17 08:46:38 +05:30
Himanshu Warekar
c58d0317a4 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-17 08:43:36 +05:30
Suraj Shetty
3fdeffff7a feat: Add medium field in call log doctype 2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596 feat: Add call recording URL field to call log 2019-06-17 08:06:14 +05:30
rohitwaghchaure
2e98da8bfe Merge pull request #17958 from rohitwaghchaure/revert_group_by_voucher_general_ledger_develop
fix: revert group by voucher general ledger changes
2019-06-17 07:43:32 +05:30
Rohit Waghchaure
b821af44b6 fix: revert group by voucher general ledger changes 2019-06-17 07:42:53 +05:30
Deepesh Garg
7793df885b Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes
fix: GSTR-3b Report fixes
2019-06-16 20:03:48 +05:30
Himanshu Warekar
4d4732c4d1 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-15 13:10:07 +05:30
Himanshu Warekar
b9ddcc4bfa Merge develop into sla_fix 2019-06-15 13:09:57 +05:30
Faris Ansari
8e99aaf605 fix: Add erpnext website theme import 2019-06-14 20:06:54 +05:30
Faris Ansari
b2ab1031e3 fix: Show Clear filters when attribute filters are set 2019-06-14 18:16:14 +05:30
Faris Ansari
22642a5f45 fix: Homepage products styling (#17912) 2019-06-14 18:15:40 +05:30
rohitwaghchaure
7ae0f25f11 Merge pull request #17952 from rohitwaghchaure/added_promotional_scheme_in_selling_buying
fix: added promotional scheme in selling and buying module page
2019-06-14 17:31:43 +05:30
Rohit Waghchaure
1ecc78266c fix: added promotional scheme in selling and buying module page 2019-06-14 17:31:15 +05:30
Rohit Waghchaure
059890ecef Test cases for batch no 2019-06-14 17:24:47 +05:30
Faris Ansari
f472a49cf6 fix: Remove Specifications label 2019-06-14 16:32:21 +05:30
Mangesh-Khairnar
1db0fc91a5 fix: check generated ledger entries to avoid overlap 2019-06-14 15:48:31 +05:30
Mangesh-Khairnar
fefdac432c refactor: add json changes 2019-06-14 15:39:50 +05:30
Mangesh-Khairnar
24fbe23c8d fix: add indicators for expire in the leave allocation list 2019-06-14 15:36:26 +05:30
Anurag Mishra
a5527225b6 fix: requested changes 2019-06-14 15:26:19 +05:30
Mangesh-Khairnar
87adaed933 fix: generate ledger entries for all leave transactions 2019-06-14 15:13:53 +05:30
deepeshgarg007
37a717aa98 fix: Seperate queries for Taxable value and tax amounts 2019-06-14 14:30:36 +05:30
Rushabh Mehta
ddec4035cf Merge pull request #17837 from Anurag810/hr_dashboard
feat: Dashboards for Human Resource module
2019-06-14 14:26:00 +05:30
Anurag Mishra
e87ebcaf04 fix: upadated employee dashboard 2019-06-14 14:10:48 +05:30
Anurag Mishra
0ae6cbdd01 fix: requested Changes 2019-06-14 14:10:48 +05:30
Anurag Mishra
e6dd55d9f2 feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
rohitwaghchaure
6f6a1c8908 Merge pull request #17946 from Anurag810/make_stock_entry_against_purchase_receipt_3
feat: Creating stock entry against purchase receipt and some minor fixes
2019-06-14 13:32:22 +05:30
deepeshgarg007
c62518c094 Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes 2019-06-14 13:14:51 +05:30
deepeshgarg007
8f04f6c631 fix: GSTR-3b Report fixes 2019-06-14 13:08:09 +05:30
Anurag Mishra
4c1639305f feat: creating stock entry against purchase receipt 2019-06-14 12:31:08 +05:30
Deepesh Garg
b095d0a0c5 fix: GSTR-2 Report fixes (#17903) 2019-06-14 12:02:36 +05:30
Deepesh Garg
459155fae1 fix: GST Validation for UIN and OIDAR (#17866)
* fix: GST Validation for UIN and OIDAR

* fix: Define GST category

* fix: Get gst category only for Customer and Supplier

* fix: GST validation

* fix: GST validation fixes
2019-06-14 12:01:34 +05:30
Rushabh Mehta
35bb7b8761 Merge pull request #17369 from alyf-de/datev_report
feat(regional): Report for German tax consultants (DATEV)
2019-06-14 12:00:04 +05:30
rohitwaghchaure
a030138df8 fix: trial balance opening balance not showing in the debit side for the liability account (#17944) 2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b fix: column width (#17935) 2019-06-14 11:29:18 +05:30
Anurag Mishra
88cd502841 fix: company form (#17939) 2019-06-14 11:26:29 +05:30
Saurabh
0d50523723 Merge pull request #17941 from nabinhait/salary-slip-amount-dev
fix: salary slip amount calculation based on formula
2019-06-14 11:19:31 +05:30
Mangesh-Khairnar
6726dea88b style: change formatting 2019-06-14 11:17:17 +05:30
Mangesh-Khairnar
4e1b60d401 style: change formatting 2019-06-14 11:15:54 +05:30
Rushabh Mehta
5a02aa0d5c Merge pull request #17900 from sobolevn/patch-1
fix: Improves README.md with svg badge
2019-06-14 10:52:20 +05:30
Rushabh Mehta
b74454e501 Merge pull request #17894 from deepeshgarg007/serial_no_batch_selector_develop
fix: Available qty not shown in item batch selector for batch
2019-06-14 10:51:34 +05:30
Nabin Hait
a2caf884fe fix: salary slip amount calculation based on formula 2019-06-13 19:44:21 +05:30
Mangesh-Khairnar
f8bf57c956 fix: remove transaction section head 2019-06-13 18:09:23 +05:30
Shivam Mishra
1b5a54900c Merge pull request #17933 from Anurag810/billing_summary_fixes
fix: column sequence and add total hours
2019-06-13 17:26:56 +05:30
Suraj Shetty
7877ef22ba Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-13 17:13:59 +05:30
Suraj Shetty
06f8034542 refactor: Remove redundant code 2019-06-13 17:13:54 +05:30
rohitwaghchaure
da0d056a06 Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
feat: added cost center in the opening invoice creation tool
2019-06-13 16:27:18 +05:30
rohitwaghchaure
95c88a5e95 Merge pull request #17932 from rohitwaghchaure/fixed_pos_not_overriding_the_taxes_develop
fix: taxes are not overriding after changing the tax template for the POS invoice
2019-06-13 16:26:11 +05:30
Shivam Mishra
ae7e13a58f Merge pull request #17927 from Mangesh-Khairnar/bom-item-fix
fix: Check fields before making BOM items
2019-06-13 16:18:12 +05:30
Shivam Mishra
4def9836e0 Merge branch 'develop' into bom-item-fix 2019-06-13 16:17:54 +05:30
Anurag Mishra
05c17a505c fix: column sequence and add total 2019-06-13 16:08:01 +05:30
Rohit Waghchaure
033ed93586 fix: taxes are not overriding after changing the taxes template 2019-06-13 15:47:42 +05:30
Rohan Bansal
e3a3306b30 feat(customer): Add report to show item prices per Customer 2019-06-13 14:53:33 +05:30
Mangesh-Khairnar
b2f266ad10 fix: get bom item when company is not passed 2019-06-13 14:34:40 +05:30
Faris Ansari
00578ba632 fix: Show product page even if cart is not enabled 2019-06-13 13:30:39 +05:30
Rohit Waghchaure
02ae934d5c feat: added cost center in the opening invoice creation tool 2019-06-13 12:00:30 +05:30
Deepesh Garg
0d7d4879a9 Merge pull request #17920 from Anurag810/stock_balance_report
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
sahil28297
7007931438 Merge pull request #17913 from scmmishra/lms-link-fix
refactor: topic card redirects to login
2019-06-12 20:09:22 +05:30
Mangesh-Khairnar
0a3ed374cd test: validate tax based expense claim gl entries 2019-06-12 20:03:22 +05:30
Anurag Mishra
bbe2c4fb01 fix: fetch item on the base of item group 2019-06-12 19:09:51 +05:30
Mangesh-Khairnar
a1d354e147 feat: add grand total field 2019-06-12 18:18:38 +05:30
Rohan Bansal
ddea50fa22 fix(stock): Remove hardcoded validation for Item 2019-06-12 17:59:23 +05:30
Deepesh Garg
a3c0d2768e Merge branch 'develop' into serial_no_batch_selector_develop 2019-06-12 17:21:23 +05:30
Shivam Mishra
d9aabb83cd Merge branch 'develop' into lms-link-fix 2019-06-12 17:21:05 +05:30
Shivam Mishra
b94b1febee refactor: topic card redirects to login 2019-06-12 17:20:33 +05:30
Rushabh Mehta
26dba8bb89 Merge pull request #17801 from deepeshgarg007/dashboards
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
Suraj Shetty
16fc5189d1 Merge branch 'develop' into call-summary-dialog 2019-06-12 17:13:13 +05:30
sahil28297
3fd51ccd38 Merge pull request #17908 from scmmishra/education-test-fixes
test: fix fixtures for program and course
2019-06-12 17:01:27 +05:30
sahil28297
deef0908d7 Merge branch 'develop' into education-test-fixes 2019-06-12 16:59:58 +05:30
Shivam Mishra
5e62142ff4 Merge pull request #17911 from scmmishra/lms-redirect-fixes
fix: redirect to lms home if query params not set
2019-06-12 16:05:34 +05:30
Shivam Mishra
147d5d9bf2 fix: redirect to lms home if query params not set 2019-06-12 16:01:02 +05:30
Deepesh Garg
9c3d2eeb1f Merge branch 'develop' into serial_no_batch_selector_develop 2019-06-12 15:54:44 +05:30
Shivam Mishra
3264822c1c test: fixed unknown column course_name 2019-06-12 15:43:36 +05:30
Suraj Shetty
12cd4bcd71 Merge branch 'develop' into call-summary-dialog 2019-06-12 15:43:19 +05:30
Shivam Mishra
8d95c846e4 Merge pull request #17910 from scmmishra/lms-patch-5
fix: template issue in LMS
2019-06-12 15:24:40 +05:30
Shivam Mishra
1c9280c73f Merge branch 'develop' into lms-patch-5 2019-06-12 15:24:15 +05:30
Shivam Mishra
44f98a9a4b fix: back to course button 2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83 fix: card imqge not visible for courses 2019-06-12 15:16:26 +05:30
Anurag Mishra
e4fca91792 Merge pull request #17909 from scmmishra/lms-template-fix
fix: template fix for null_card
2019-06-12 14:56:25 +05:30
Shivam Mishra
278ef4bf73 fix: template fix for null_card 2019-06-12 14:53:00 +05:30
Shivam Mishra
a99d3a844f test: fix fixtures for program and course 2019-06-12 14:32:27 +05:30
Suraj Shetty
a7ac218584 Merge branch 'develop' into call-summary-dialog 2019-06-12 13:28:41 +05:30
Shivam Mishra
6a2de27941 Merge pull request #17907 from scmmishra/lms-patch-4
fix: templates for cards
2019-06-12 12:53:39 +05:30
Mangesh-Khairnar
444313bdfc feat: change the claim amount in expenses to amount 2019-06-12 12:52:02 +05:30
Shivam Mishra
28b2da7850 Merge branch 'develop' into lms-patch-4 2019-06-12 12:51:53 +05:30
Shivam Mishra
8df7e1c215 fix: templates for cards 2019-06-12 12:50:38 +05:30
Shivam Mishra
baeaca6dd4 Merge pull request #17906 from scmmishra/lms-patch-3
refactor: remove course name field from ProgramCourse
2019-06-12 12:44:23 +05:30
Shivam Mishra
147cd1035e Merge branch 'develop' into lms-patch-3 2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69 refactor: remove course name field from ProgramCourse 2019-06-12 12:43:22 +05:30
Shivam Mishra
5047c00476 Merge pull request #17905 from scmmishra/lms-acad-fixes
refactor: doctype settings for lms
2019-06-12 12:40:50 +05:30
Shivam Mishra
490d2e0357 Merge branch 'develop' into lms-acad-fixes 2019-06-12 12:40:30 +05:30
Shivam Mishra
a9508862b2 refactor: doctype settings for lms 2019-06-12 12:39:12 +05:30
Saurabh
ccbf646a4d Merge pull request #17904 from deepeshgarg007/patch_fix
fix(patch): Fix breaking patch on develop branch
2019-06-12 12:33:38 +05:30
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874)
* make travel request submittable

* add patch

* remove patch
2019-06-12 12:25:48 +05:30
Anurag Mishra
65c355b8c8 fix: show cost_center in print format of report trial balance (#17871)
* fix: show cost center in print fromat of report trial balance

* fix: requested changes
2019-06-12 11:18:13 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
deepeshgarg007
44ac3580d9 fix: Fix breaking patch on develop branch 2019-06-11 18:35:01 +05:30
Mangesh-Khairnar
283d2c5ca2 fix: only create leave application ledger on intermediate allocation expiry 2019-06-11 16:35:29 +05:30
Mangesh-Khairnar
ac9a4fe03c feat: add tax and charges in expense claim 2019-06-11 14:25:44 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Anurag Mishra
ff99cea1c4 Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +05:30
rohitwaghchaure
ba715feb7f Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Suraj Shetty
6013375fbb fix: Improve call popup UX
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928 fix: Save summary to right field 2019-06-11 08:01:18 +05:30
Nikita Sobolev
9e0ce99615 Improves README.md with svg badge 2019-06-10 20:19:40 +03:00
Himanshu
056f20ccaa Merge branch 'develop' into sla_fix 2019-06-10 18:53:22 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
deepeshgarg007
9297829804 fix: Codacy 2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87 fix: Available qty not shown in item batch selector for batch 2019-06-10 17:46:16 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9 fix(patch): escape illegal characters to avoid SQL syntax error (#17890) 2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48 fix: GSTR-1 Report fixes (#17885) 2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137 Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop
fix: set COGS for material issue only
2019-06-10 16:57:23 +05:30
Suraj Shetty
a08ab14d80 Merge pull request #17887 from scmmishra/academy-lms-fixes
fix: null cards visible on xs
2019-06-10 14:24:23 +05:30
Himanshu Warekar
874326dc7b patch: set apply_to as customer 2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718 Merge develop into sla_fix 2019-06-10 12:32:45 +05:30
Himanshu Warekar
0b36d324ee fix: display depends for apply_to in sla 2019-06-10 11:36:51 +05:30
Himanshu Warekar
65e0ae2171 test: new test cases for sla 2019-06-10 11:24:24 +05:30
Shivam Mishra
f2bbe8af03 Merge branch 'develop' into academy-lms-fixes 2019-06-10 10:56:27 +05:30
Shivam Mishra
9510e69910 fix (lms): null cards visible on xs 2019-06-10 10:53:25 +05:30
Suraj Shetty
13770ccf7a fix: Codacy 2019-06-10 09:52:53 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
Himanshu Warekar
88becdd869 test: test cases for sla with apply_to 2019-06-09 19:33:55 +05:30
Himanshu Warekar
0674d16fee feat: sla based on customer/group/territory 2019-06-07 15:28:42 +05:30
Rohit Waghchaure
9a792c2eed stock_entry: set COGS for material issue only 2019-06-07 15:20:36 +05:30
Shivam Mishra
f280c82083 Merge pull request #17878 from scmmishra/academy-lms-fixes
fix: minor bugs in lms
2019-06-07 13:44:05 +05:30
Shivam Mishra
449f261128 feat: show signup dialog for Guest 2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee fix: link typo 2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc fix: lms card hero image no visible 2019-06-07 13:34:41 +05:30
rohitwaghchaure
74d45f40a8 Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop
fix: Not able to save salary slip
2019-06-07 12:58:25 +05:30
Suraj Shetty
f1ffdb3c12 feat: Add call sound effects 2019-06-07 12:48:13 +05:30
Suraj Shetty
6a87e3338b fix: Call popup UI 2019-06-07 11:52:39 +05:30
Rohit Waghchaure
72264697be fix: Not able to save salary slip 2019-06-07 11:46:27 +05:30
Mangesh-Khairnar
b16d395a8f Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-07 11:33:06 +05:30
Mangesh-Khairnar
e4d03bf0d0 fix: consider expiry in leaves 2019-06-07 11:30:27 +05:30
rohitwaghchaure
74f502cfa6 Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items
feat: provision to set multiple manufacturer against the item
2019-06-07 10:24:53 +05:30
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +05:30
Mangesh-Khairnar
368a974368 style: change formatting 2019-06-06 20:43:32 +05:30
Mangesh-Khairnar
86e0f4c617 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-06 20:41:28 +05:30
Himanshu
2d7cbcd79f Merge pull request #17780 from hrwX/qmsystem
refactor(Quality): QMS refactor
2019-06-06 20:41:25 +05:30
Mangesh-Khairnar
c7b9ae9c5e fix: get leave balance based on the ledger entries 2019-06-06 20:38:59 +05:30
Mangesh-Khairnar
b840ba4407 feat: show dashboard on submit 2019-06-06 20:38:23 +05:30
Mangesh-Khairnar
00c607116b fix: handle negative leaves without allocation 2019-06-06 20:37:34 +05:30
Mangesh-Khairnar
f13243a92e feat: fetch annual allocation based on leave policy 2019-06-06 20:35:10 +05:30
Mangesh-Khairnar
3863fc5fb2 feat: create ledger entry for each earned leave 2019-06-06 20:34:10 +05:30
Mangesh-Khairnar
050f65beb4 feat: fetch leave allocation from ledger entry 2019-06-06 20:32:01 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Himanshu
c4366c9357 Merge branch 'develop' into qmsystem 2019-06-06 19:04:48 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Anurag Mishra
4ca393d14c fix: renamed report BOM item scraps into BOM Explorer (#17869) 2019-06-06 18:05:08 +05:30
Anurag Mishra
4992fc98dd Merge branch 'develop' into qmsystem 2019-06-06 17:25:39 +05:30
Shivam Mishra
67e345dfda Merge pull request #17870 from scmmishra/lms-refactor
fix: sql query case fix
2019-06-06 17:21:35 +05:30
Shivam Mishra
d49b5e4736 fix: sql query case fix 2019-06-06 17:19:53 +05:30
Himanshu
b57b4a7199 Merge branch 'develop' into qmsystem 2019-06-06 16:42:53 +05:30
Shivam Mishra
76fe1b1e9f Merge pull request #17674 from scmmishra/lms-refactor
refactor: lms
2019-06-06 16:32:17 +05:30
Shivam Mishra
2a0483dee3 refactor: styling cards and article 2019-06-06 16:02:38 +05:30
Himanshu
d0d5380cb1 Merge branch 'develop' into qmsystem 2019-06-06 15:37:04 +05:30
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
c0a640c462 feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
Shivam Mishra
6132c8527b refactor: all programs are shown on home by deafult 2019-06-06 14:19:36 +05:30
Himanshu Warekar
db1d1197ea feat: add fixtures 2019-06-06 14:17:07 +05:30
Shivam Mishra
098b8324f2 refactor: remove erpnext.com link 2019-06-06 14:14:17 +05:30
Himanshu Warekar
ab97cd4db1 feat: dashboards 2019-06-06 14:13:10 +05:30
Shivam Mishra
b31276572b refactor: styling changes 2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b fix: minor bugs 2019-06-06 14:02:49 +05:30
Deepesh Garg
d07163ecf8 Merge pull request #17867 from shipmnts/develop_add_gstin_filters
fix: GSTIN filters in hsn wise summary and itemised reports
2019-06-06 13:28:39 +05:30
Himanshu Warekar
b114d9f621 test: fix test case 2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Himanshu Warekar
b318b83bb7 patch: fixes 2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124 patch: fixes 2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6 patch: add priority in service level and agreement 2019-06-06 11:49:15 +05:30
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Suraj Shetty
87645e98ad fix: Get available employees from communication medium 2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549 fix: Create call log instead of communication 2019-06-06 11:18:16 +05:30
Himanshu Warekar
b9c24a01da patch: reload_doc before inserting values 2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249 patch: set priorities for issue 2019-06-06 10:58:42 +05:30
Suraj Shetty
27234ff907 fix: Update call log doctype 2019-06-06 10:57:13 +05:30
Himanshu Warekar
e119a713fd Merge develop into sla_fix 2019-06-06 10:46:36 +05:30
Saurabh
6179130a54 Merge pull request #17861 from frappe/clarkejj-patch-1
fix: Update demo.html
2019-06-06 10:37:48 +05:30
Saurabh
f4b840d1ec Merge pull request #17862 from adityahase/fix-error-report-email
fix(error-report): Do not send error reports to support@erpnext.com
2019-06-06 10:36:41 +05:30
Aditya Hase
29e77ccc00 fix(error-report): Do not send error reports to support@erpnext.com 2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d Update demo.html
fix typo nit in page
2019-06-05 10:49:47 -06:00
Mangesh-Khairnar
351f4d53a0 feat: add employee filter to employee leave balance 2019-06-05 21:22:07 +05:30
Mangesh-Khairnar
62011c9dc4 feat: add link to policy 2019-06-05 21:16:27 +05:30
Nabin Hait
68eaaa068b fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46 fix: NoneType fixes in Lab test (#17858) 2019-06-05 20:23:23 +05:30
Shivam Mishra
f121b51951 fix: import _ in porgram.py 2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa feat: added topic page 2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe chore: remove old lms files 2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0 fix: minor ui fixes 2019-06-05 18:16:09 +05:30
Shivam Mishra
9cad9439a1 fix: travis fixes for education setup 2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95 refactor: minor fixes 2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27 chore: added session check for profile page 2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede feat: added student profile page 2019-06-05 17:29:48 +05:30
Rohan
bd9abc15b5 fix(projects): Remove hardcode of expected end date for new Tasks (#17717) 2019-06-05 14:17:29 +05:30
Himanshu Warekar
b903da6bfd fix: remove priorities list 2019-06-05 13:42:03 +05:30
Shivam Mishra
6593263df8 feat: added navigation 2019-06-05 13:34:44 +05:30
Nabin Hait
3f97fac8e1 feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Shivam Mishra
570161b978 feat: added course progress apis 2019-06-05 13:08:53 +05:30
Suraj Shetty
0d64343ec0 feat: Add Call Log, Communication Medium, Communication Medium Timeslot doctype 2019-06-05 12:25:17 +05:30
Suraj Shetty
bf1195e0b9 feat: Introduce communication module 2019-06-05 12:23:30 +05:30
Aditya Hase
811bed32c1 fix(naming): Limit number of docs to be renamed to 50000 per doctype (#17827)
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error

This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Himanshu
4cb1a1e2e3 fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
da2e009990 fix(payment-order): filter already created payment entries (#17843) 2019-06-05 10:22:05 +05:30
Nabin Hait
189f4a7fff Merge pull request #17847 from deepeshgarg007/support-analytics
fix: Remove support analytics report
2019-06-05 10:21:09 +05:30
Suraj Shetty
cf270845f2 fix: Indicator toggler 2019-06-05 10:04:51 +05:30
deepeshgarg007
a87c545907 fix: Remove support analytics report 2019-06-05 09:07:42 +05:30
deepeshgarg007
1831844fcf fix: Dashboard for cost center 2019-06-03 21:53:58 +05:30
rohitwaghchaure
941af3f078 Merge pull request #17839 from rohitwaghchaure/fix_payment_period_based_on_invoice_date_error_develop
fix: report Payment Period Based On Invoice Date not working
2019-06-03 20:12:25 +05:30
Mangesh-Khairnar
afa1dc4ffa feat: expire current allocation 2019-06-03 20:09:22 +05:30
Himanshu Warekar
68ed272bfa feat: show priorities listed in sla in issue 2019-06-03 18:59:55 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
Rushabh Mehta
6744febedd Merge pull request #17769 from deepeshgarg007/dimensions
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Shivam Mishra
6d4c666476 feat: added topic progress api 2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae feat: added auto course enrollment for enrolled programs 2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620 Merge pull request #17835 from deepeshgarg007/serial-no-devlop
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367 Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934 fix: Pass delivery document no as empty string 2019-06-03 13:06:37 +05:30
Nabin Hait
2cc5fcf33b Merge pull request #17833 from netchampfaris/issue-portal-styling
fix: Issue list portal styling
2019-06-03 13:05:53 +05:30
Shivam Mishra
d1a252190b refactor: refactored quiz api and added quiz.js 2019-06-03 12:57:38 +05:30
Suraj Shetty
d1668e22d1 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-03 12:36:45 +05:30
Suraj Shetty
e9bfecf405 fix: Add code to update call summary 2019-06-03 12:27:02 +05:30
deepeshgarg007
853a561f11 fix: Serial no filtering issue for delivered items 2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413 fix: codacy 2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c fix: codacy 2019-06-02 19:46:44 +05:30
deepeshgarg007
290847df46 fix: Fixes in accounting doctype dashboards 2019-06-02 19:35:18 +05:30
Rohit Waghchaure
87c4b06437 Test cases for serial no 2019-06-02 16:29:07 +05:30
Rohit Waghchaure
66aa37f1e2 provision to add batch number in the stock reconciliation 2019-06-02 16:29:07 +05:30
Rohit Waghchaure
05d3bcb63d stock recon for serial no, batch no 2019-06-02 16:29:06 +05:30
deepeshgarg007
6d313c72e1 fix: Remove diemnsion from value list if present 2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a fix: Resolve merge conflicts in purchase_receipt_item 2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785 fix: Update function name 2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872 Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-06-01 22:57:51 +05:30
Faris Ansari
b8eaa3d377 fix: Issue list portal styling 2019-06-01 20:56:37 +05:30
Saurabh
011fe48ec3 Merge pull request #17823 from abhijitkumbharInd/develop
fix: Vehicle Master - Last carbon check accepting future date.(#17821)
2019-05-31 14:26:08 +05:30
Saurabh
f68bd8f349 Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
b6028b0495 Merge pull request #17809 from Alchez/develop-sales-analytics-total
fix(selling): Remove Totals row for Sales Analytics
2019-05-31 14:21:01 +05:30
Saurabh
731986d8ee Merge pull request #17811 from nabinhait/pr-expense-account-dev
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
abhijitkumbharIND
39d6cf38fc fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
Rohit Waghchaure
e98d1c1147 fix: allow import for packing slip 2019-05-31 14:16:11 +05:30
Suraj Shetty
1482b0cc01 Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-05-31 13:42:30 +05:30
Suraj Shetty
893a0c24bb fix: Add call summary 2019-05-31 13:42:22 +05:30
Deepesh Garg
bd3c60254a Merge pull request #17819 from deepeshgarg007/module
fix: Add chart of accounts importer in data import module
2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3 Merge pull request #17816 from deepeshgarg007/ar_translations_develop
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop
fix: POS cash mode of payment css
2019-05-31 12:29:19 +05:30
rohitwaghchaure
09d8bb8aa9 Merge pull request #17822 from rohitwaghchaure/pricing_rule_applying_on_the_non_conditional_item
fix: pricing rule is applying on the incorrect item
2019-05-31 12:17:18 +05:30
Rohit Waghchaure
840244c562 fix: pricing rule is applying on the incorrect item 2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c fix: Add chart of accounts importer in data import module 2019-05-31 10:11:46 +05:30
Mangesh-Khairnar
c5385e141b fix: add mandatory reason fields in leave application 2019-05-31 00:53:28 +05:30
Rohit Waghchaure
4fd704dbb6 fix: POS cash mode of payment css 2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
rohitwaghchaure
3fa54905a2 Merge pull request #17814 from rohitwaghchaure/new_pricing_rule_not_exists_issue
fix: pricing rule not exists issue
2019-05-30 22:25:45 +05:30
Rohit Waghchaure
ac8f4b449d fix: pricing rule not exists issue 2019-05-30 22:24:24 +05:30
Mangesh-Khairnar
95e5d812fe fix: UX changes 2019-05-30 22:22:15 +05:30
deepeshgarg007
2580075583 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-30 22:11:27 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
Shivam Mishra
46b3446da0 refactor: add check for max passing score 2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5 refactor: added question type field 2019-05-30 18:54:58 +05:30
Shivam Mishra
253a2bd260 refactor: goodbye Vue 👋 2019-05-30 18:54:11 +05:30
Shivam Mishra
e94e9d2b06 feat: content navigation and activity tracking working 2019-05-30 18:23:03 +05:30
Nabin Hait
0e1e37c921 fix: Added Expense Account field to push value from PO-PR-PI 2019-05-30 18:13:41 +05:30
Shivam Mishra
3336fb595c style: removed console.logs 2019-05-30 18:04:36 +05:30
Rohan Bansal
250734dd24 fix(selling): Remove Totals row for tree-based Sales Analytics 2019-05-30 17:30:50 +05:30
Nabin Hait
b6ffaf11fe Merge pull request #17787 from nabinhait/naming-series-chars
fix: Allowed '{' and '}' in naming series
2019-05-30 17:25:08 +05:30
Nabin Hait
1bb3fc3c19 Merge pull request #17789 from sunnyakaxd/patch-2
fix: Dont fetch all orders to update a few
2019-05-30 17:24:49 +05:30
Shivam Mishra
12579617f3 refactor: added enrolled status to program card 2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc feat: enabled per student access 2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000 refactor: style changes and template refactor 2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1 refactor: added enrollment api 2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b refactor: added program card macro 2019-05-30 16:34:53 +05:30
Nabin Hait
d060890817 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 16:05:30 +05:30
Deepesh Garg
af32ed6d8f Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance
feat: Product Bundle Balance Report
2019-05-30 15:58:25 +05:30
Saurabh
2b40a44429 Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30
feat: Updated translation
2019-05-30 15:56:45 +05:30
Nabin Hait
4d58734492 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 15:51:29 +05:30
Saif Ur Rehman
7129231dbb fix(Product Bundle Balance): Update frappe.db.escape for v12 2019-05-30 13:55:32 +05:00
Anurag Mishra
62d58acea9 fix: Added description if item variants does not have description in map(v12) (#17796)
* fix: variant item description based on attribute

* style: removed unwanted changes
2019-05-30 14:04:08 +05:30
frappe
5aeb62f288 feat: Updated translation 2019-05-30 08:17:59 +00:00
Mangesh-Khairnar
91e62f575e fix: department filters in employee leave balance 2019-05-30 13:38:35 +05:30
Mangesh-Khairnar
2124d9884b fix: pass positional arguments on creation of leave application 2019-05-30 13:21:34 +05:30
Mangesh-Khairnar
aafb5cb6f6 fix: ignore expired non-carry forwarded allocation on calculating leaves taken 2019-05-30 13:13:14 +05:30
deepeshgarg007
a9b2e4e4a8 fix: White space in subscription plan dashboard 2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754 fix: Tax category dashboard 2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596 fix: Dashboards for doctypes in accounting modules 2019-05-30 11:53:12 +05:30
Himanshu Warekar
70a2734aab fix: config file for qms 2019-05-30 01:40:31 +05:30
Mangesh-Khairnar
ded33a7e2e fix: ledger entries creation 2019-05-29 19:12:19 +05:30
Shivam Mishra
f927502cc5 refactor: added lms utilities for enrollment and program list 2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e refactor: cards and hero markup 2019-05-29 18:38:58 +05:30
Shivam Mishra
08425d46fa refactor: set Student as default portal role for Education 2019-05-29 18:37:52 +05:30
Deepesh Garg
12a9a3ffa3 Merge branch 'develop' into Product-Bundle-Balance 2019-05-29 18:23:21 +05:30
Mangesh-Khairnar
7cc6a67c18 add department filter to employee leave balance 2019-05-29 15:59:20 +05:30
Mangesh-Khairnar
8f47bffa0e fix: create an instance 2019-05-29 15:54:14 +05:30
Shivam Mishra
9944ef2baf Merge pull request #17791 from adityahase/remove-manifest
perf: Remove MANIFEST.in
2019-05-29 15:31:35 +05:30
Shivam Mishra
63d8cabb3d fix: program card height bug 2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7 refactor: /lms redirects to home if lms is disbaled 2019-05-29 15:15:59 +05:30
Shivam Mishra
65681bf317 refactor: allow disbaling self enroll on lms 2019-05-29 15:15:30 +05:30
Aditya Hase
960c6138db perf: Remove MANIFEST.in
Faster pip install -e erpnext

https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it

https://github.com/frappe/frappe/pull/7360
2019-05-29 15:14:07 +05:30
Himanshu Mishra
70029b818b Update status_updater.py 2019-05-29 14:19:35 +05:30
Nabin Hait
f1cde0ccf6 fix: Allowed '{' and '}' in naming series 2019-05-29 13:44:03 +05:30
Shivam Mishra
16f3b713bc Merge branch 'lms-refactor' of github.com:scmmishra/erpnext into lms-refactor 2019-05-29 13:14:50 +05:30
Shivam Mishra
ae2871f962 feat: content not visible to guest users 2019-05-29 13:11:34 +05:30
Nabin Hait
99f27b94c1 Merge pull request #17773 from Anurag810/request_to_quatation_fix
fix: Changed dialog field  to Select when we get supplier in request to quotation
2019-05-29 09:58:00 +05:30
Himanshu Warekar
38ed090bf8 test: fix test case 2019-05-29 00:16:04 +05:30
Himanshu Warekar
775e9e423a refactor: QMS refactor initial bringup 2019-05-29 00:05:58 +05:30
Himanshu Warekar
8240f48a8e Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-28 23:40:57 +05:30
Himanshu Warekar
beba79c420 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-05-28 23:40:43 +05:30
Himanshu Warekar
da91cfe1e2 fix: set default priority on sla change 2019-05-28 23:38:43 +05:30
deepeshgarg007
c97c7c51a9 fix: Test cases for accounting dimension 2019-05-28 18:51:10 +05:30
Faris Ansari
da2c742cea Merge branch 'develop' into request_to_quatation_fix 2019-05-28 18:28:13 +05:30
Faris Ansari
dd016479af fix: Remove print statement 2019-05-28 18:27:22 +05:30
Anurag Mishra
5afe9f2200 fix: changed dialog field to select 2019-05-28 18:23:34 +05:30
deepeshgarg007
233b88dc52 fix: Test case fixes 2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +05:30
Nabin Hait
e7b8400fc7 Merge pull request #17696 from Anurag810/warehouse_type
feat: Added Warehouse Type master
2019-05-28 17:25:13 +05:30
deepeshgarg007
e025aabef0 fix: Indentation fixes 2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
Mangesh-Khairnar
ae4228aed4 fix: fetch queries 2019-05-28 13:24:15 +05:30
deepeshgarg007
adccb2c3a4 fix: Remove print statements 2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7 fix: Multiple fixes in accounting doctype 2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b fix: Is group filter for dimensions for doctype 2019-05-28 12:13:53 +05:30
deepeshgarg007
7dfffb5f73 fix: Updated test cases for accounting dimensions 2019-05-28 12:09:45 +05:30
Himanshu
6f08866640 Merge branch 'develop' into sla_fix 2019-05-28 11:54:30 +05:30
Himanshu Warekar
9c70da9026 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-05-28 11:48:16 +05:30
Himanshu Warekar
fee2fee83a fix: test cases 2019-05-28 11:47:51 +05:30
Mangesh-Khairnar
9d6151d200 patch: add reload doc for leave ledger entry 2019-05-28 11:45:51 +05:30
Nabin Hait
5fef786441 Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
fix: Tax calculation on salary slip
2019-05-28 11:16:31 +05:30
Anurag Mishra
a69f72988a fix: requested filters changes 2019-05-28 11:08:14 +05:30
Mangesh-Khairnar
c6d6adcbf3 fix: ledger entry creation for encashment 2019-05-28 09:44:38 +05:30
Himanshu
574f81e984 Merge branch 'develop' into sla_fix 2019-05-28 00:05:04 +05:30
Himanshu Warekar
c7170f80ce Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-28 00:02:54 +05:30
Himanshu Warekar
24f8310ece fix: test cases 2019-05-28 00:01:55 +05:30
Mangesh-Khairnar
61bb236cfa test: delete ledger entry after each test to maintain balance 2019-05-27 19:36:40 +05:30
Nabin Hait
351e9983cf Merge pull request #17389 from mujeerhashmi/develop
feat: Student Group with Student Category filter
2019-05-27 19:14:31 +05:30
Nabin Hait
9813897ec3 Merge pull request #17759 from saurabh6790/custom_field_fix
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:39 +05:30
Nabin Hait
60f04d181d Merge pull request #17756 from nabinhait/property-decorator
fix(subscription): Remove property decorator (#17395)
2019-05-27 19:11:17 +05:30
Nabin Hait
7f375d209c fix: Tax calculation on salary slip 2019-05-27 18:42:53 +05:30
Anurag Mishra
32c23ae274 fix: added read write permission to stock manager 2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea fix: added permission and fix filters in stock balance report 2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0 feat: added warehouse type master 2019-05-27 18:37:04 +05:30
Nabin Hait
1f24a4d44c Merge pull request #17691 from netchampfaris/upload-attendance-progress
fix(UX): Upload Attendance
2019-05-27 17:17:03 +05:30
Nabin Hait
e662be7508 Merge pull request #17697 from nabinhait/po-status-updater-dev-1
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
54ea9b0978 Merge pull request #17709 from nabinhait/opening-stock-entry-dev
fix: Opening accounting entry for stock entry
2019-05-27 17:16:19 +05:30
Nabin Hait
4f549cc196 Merge branch 'develop' into opening-stock-entry-dev 2019-05-27 17:16:03 +05:30
Nabin Hait
aafd64d9b4 fix: On change of currency, set margin amount based on exchange rate (#17712) 2019-05-27 17:15:47 +05:30
Suraj Shetty
b1a55a2af5 fix: Add call summary 2019-05-27 16:18:50 +05:30
Mangesh-Khairnar
35786c0067 Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management 2019-05-27 15:42:11 +05:30
Mangesh-Khairnar
6f69bbe1d7 test: leave ledger balance 2019-05-27 15:40:36 +05:30
Mangesh-Khairnar
7fbaef5de3 fix: expiry ledger creation 2019-05-27 15:39:48 +05:30
Suraj Shetty
bd03a51e8f fix: Handle end call 2019-05-27 15:30:41 +05:30
Saurabh
fdf0d91087 fix: add shopify_supplier_id custom field while setting up shopify 2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255 fix(subscription): Remove property decorator (#17395) 2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799 Merge branch 'develop' into Product-Bundle-Balance 2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5 Merge branch 'develop' into develop 2019-05-27 14:00:53 +05:30
Nabin Hait
275185438a Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO 2019-05-27 14:00:43 +05:30
Nabin Hait
39490ca0c5 Merge branch 'develop' into sla_fix 2019-05-27 13:59:56 +05:30
Nabin Hait
c9a4111f4d Merge branch 'develop' into leave-management 2019-05-27 13:59:27 +05:30
Mitchy25
a8f6938556 Fix: Precision in Appraisals (#17673)
* Update appraisal.js

This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.

* fix: score based on field's precisin
2019-05-27 13:57:56 +05:30
Nabin Hait
235332d4ab Merge branch 'develop' into lms-refactor 2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3 Merge branch 'develop' into upload-attendance-progress 2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6 Merge branch 'develop' into po-status-updater-dev-1 2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949 Merge branch 'develop' into opening-stock-entry-dev 2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803 fix: Do not fetch batch items and serialized items in stock reconciliation (#17725) 2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde fix: Updated Field Labels in Work Order (#17750) 2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50 fix: GSTR-1 Report B2B fixes (#17751)
* fix: GSTR-1 Report fixes

* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c fix: holidays was showing on same date in calendar view (#17754) 2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9 Merge branch 'develop' into upload-attendance-progress 2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c Merge branch 'develop' into po-status-updater-dev-1 2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a Merge branch 'develop' into opening-stock-entry-dev 2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3 fix: Improve error message (#17747)
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```

```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30 fix: payment reconciliation against expense claim (#17729)
* fix: payment reconciliation against expense claim

* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
71cdcb3593 style: add a more descriptive method name 2019-05-27 11:00:04 +05:30
Mangesh-Khairnar
24248f687b patch: create entries for only missing transactions 2019-05-27 10:58:42 +05:30
Suraj Shetty
39a4d59cf6 fix: Call popup modal 2019-05-27 10:38:43 +05:30
Mangesh-Khairnar
45197965d7 fix: give cancellation permission to hr manager 2019-05-27 03:26:48 +05:30
Mangesh-Khairnar
d751281fa7 fix: application and leave encashment test cases 2019-05-27 03:23:58 +05:30
Mangesh-Khairnar
e7d307e6bf fix: only expire carry forwarded allocation via scheduler 2019-05-27 03:21:32 +05:30
Mangesh-Khairnar
2417c93d0e feat: create expiry and carry forward calculation on leave allocation creation 2019-05-27 03:20:10 +05:30
Mangesh-Khairnar
c99f644ffe test: carry forward and expiry allocation 2019-05-27 03:13:47 +05:30
Mangesh-Khairnar
7a7f4bd822 fix: leave balance calculation 2019-05-27 03:12:57 +05:30
Mangesh-Khairnar
9e3b688333 test: create leave policy 2019-05-27 03:10:39 +05:30
Mangesh-Khairnar
f3926d0fcb patch: leave ledger entries 2019-05-26 20:17:16 +05:30
deepeshgarg007
e9c6e644f7 fix: Multiple changes in dimension creation logic 2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
Suraj Shetty
824d0ecc48 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-26 07:30:51 +05:30
Himanshu Warekar
6feb12d333 fix: miscellaneous fixes 2019-05-26 00:03:40 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Faris Ansari
932a767de4 Merge branch 'develop' into upload-attendance-progress 2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f Merge pull request #17703 from rmehta/yeah-form-js
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61 fix(minor): after manual testing 2019-05-24 11:22:31 +05:30
Suraj Shetty
591ad37894 fix: call popup [wip] 2019-05-24 10:11:48 +05:30
Mangesh-Khairnar
45cf02308e fix: prevent manual creation of ledger entries 2019-05-23 20:29:18 +05:30
Mangesh-Khairnar
8ef81870bb test: create leave ledger entry for encashment 2019-05-23 20:28:16 +05:30
Faris Ansari
513bfc26d2 Merge branch 'develop' into upload-attendance-progress 2019-05-23 20:04:16 +05:30
Nabin Hait
d8496a770a fix: validate expense account for opening stock reco 2019-05-23 15:32:55 +05:30
rohitwaghchaure
0c2e3c77a3 fix: range 4 for ageing filter added in the AP/AR report (#17715) 2019-05-23 15:27:47 +05:30
rohitwaghchaure
fd4815da53 Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-23 15:04:43 +05:30
Faris Ansari
8f784c8555 fix: Remove console statement 2019-05-23 14:39:38 +05:30
Saurabh
ba04c3e5bb fix: table name alias (#17706) 2019-05-23 14:16:56 +05:30
Nabin Hait
5173170be3 fix: validate expense account for opening stock entry 2019-05-23 12:10:51 +05:30
deepeshgarg007
7de05ae8f3 fix: Dashboards for doctypes in accounting module 2019-05-23 11:29:39 +05:30
Nabin Hait
79f84e58ba test: Add test case for opening stock entry gle 2019-05-23 11:16:12 +05:30
Nabin Hait
8770ea2631 fix: Opening accounting entry for stock entry 2019-05-23 11:15:04 +05:30
Saurabh
45cd60dfb2 Merge pull request #17645 from nabinhait/bom-item-rate-dev
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-22 18:58:34 +05:30
Mangesh-Khairnar
5ba17c87e5 feat: remove update allocation after submit 2019-05-22 18:29:22 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Suraj Shetty
07fe299628 fix: Make changes to fix call flow and popup trigger 2019-05-22 15:48:57 +05:30
Nabin Hait
318ba2b538 Merge branch 'develop' into lms-refactor 2019-05-22 15:15:51 +05:30
Nabin Hait
0ce85735b8 Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12 2019-05-22 15:06:04 +05:30
Nabin Hait
13e0fcde0c Merge branch 'develop' into upload-attendance-progress 2019-05-22 15:05:50 +05:30
Nabin Hait
5ee08620cb Merge branch 'develop' into po-status-updater-dev-1 2019-05-22 15:05:08 +05:30
Suraj Shetty
ee7d6e4598 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-22 14:55:48 +05:30
rohitwaghchaure
8529cde0f0 Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-22 13:23:44 +05:30
rohitwaghchaure
0432d3844b Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop
fix: removed translation for customer type and tax charge type
2019-05-22 13:23:25 +05:30
Rohit Waghchaure
68a1456672 fix: removed translation for customer type and tax charge type 2019-05-22 13:22:39 +05:30
Nabin Hait
ecf25907a5 fix: set schedule date from MR to PO 2019-05-22 13:07:26 +05:30
Nabin Hait
bfb09d51a3 fix: test cases 2019-05-22 12:15:56 +05:30
Nabin Hait
b7bdcc3992 fix: Don't set reqd date in PO based on MR, if less than today 2019-05-22 12:01:17 +05:30
Nabin Hait
915edbf9ce fix: po status 2019-05-22 12:00:36 +05:30
Nabin Hait
d752051b8d fix: update received qty in PO from PR 2019-05-22 11:59:19 +05:30
Suraj Shetty
fb1964aa18 fix: Changes to fix popup 2019-05-22 06:38:25 +05:30
Suraj Shetty
1eeb89fb77 feat: Add get_call status & make a call function 2019-05-22 06:37:43 +05:30
Suraj Shetty
57bab84198 feat: Add exotel settings 2019-05-22 06:25:45 +05:30
Himanshu Warekar
ff1a8b3070 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-21 22:42:10 +05:30
Himanshu Warekar
323ea2d33a feat: change SLA as well as priorities 2019-05-21 22:39:42 +05:30
Faris Ansari
9e5665dc0a Merge branch 'develop' into upload-attendance-progress 2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225 fix(UX): Upload Attendance
Enqueue import if rows more than 200. Show import progress in dashboard.
2019-05-21 17:58:55 +05:30
Rohit Waghchaure
c41118bac7 Get default warehouse from the stock settings in the get_item_details 2019-05-21 15:21:13 +05:30
Nabin Hait
7327f8a901 fix: Person / Org name is not mandatory while creation of lead from email (#17676) 2019-05-21 15:05:26 +05:30
Rushabh Mehta
98a80407f8 Merge pull request #17538 from adityahase/fix-training-feedback
fix(hr): Use event_status instead of status
2019-05-21 12:19:03 +05:30
Rushabh Mehta
397a48d11f Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev
fix: GL Entry for opening stock reconciliation
2019-05-21 12:17:22 +05:30
Rohit Waghchaure
5e7b4ca6a4 fix: while making the item, default warehouse not set even if the stock settings has the warehouse 2019-05-21 12:14:16 +05:30
Shivam Mishra
87a7438d38 chore: added macro for page hero 2019-05-21 12:05:19 +05:30
Shivam Mishra
c8c790a097 feat: Added content page and minor doctype changes 2019-05-21 12:04:50 +05:30
Rushabh Mehta
8c78299158 fix(readme): logo 2019-05-21 11:57:33 +05:30
Rohit Waghchaure
6358370735 fix: item group not disaplying in the website if shopping cart is disabled 2019-05-21 10:53:39 +05:30
Suraj Shetty
863b93c32d refator: Rename files and move code 2019-05-21 07:57:06 +05:30
Himanshu Warekar
f38486b22c Merge develop into sla_fix 2019-05-20 23:25:26 +05:30
deepeshgarg007
ff717a7c16 fix: List view button for dimensions 2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6 Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716 feat(Communication): Move Timeline DocType and Name to Dynamic Links (#17593)
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444 feat(regional): Bank remittance report (#17524)
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3 feat: add patch to create custom fields for india specific client 2019-05-20 13:08:18 +05:30
Rohit Waghchaure
97d2a46052 feat: added checkbox in the filter of general ledger to show opening entries 2019-05-20 12:28:57 +05:30
Shivam Mishra
d7e8298a5f feat: added program and course pages 2019-05-20 11:55:32 +05:30
Himanshu Warekar
23a574d794 fix: codacy 2019-05-19 19:34:45 +05:30
Shivam Mishra
823c79588b feat: Moving to Jinja 2019-05-19 16:01:45 +05:30
Himanshu Warekar
7910215968 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-19 13:48:27 +05:30
Himanshu Warekar
22d8b3037a tests: fix issue tests 2019-05-19 11:56:37 +05:30
Himanshu Warekar
97b05e8b58 test: fixes 2019-05-19 11:14:59 +05:30
deepeshgarg007
4541605e27 fix: Test Case for accounting dimension 2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e fix: Rename function in accounting dimension 2019-05-19 11:13:21 +05:30
Himanshu Warekar
f77fe313e3 feat: change sla on the fly 2019-05-19 11:06:00 +05:30
deepeshgarg007
3d11ac0e75 fix: Accounting dimensions for child tables 2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017 fix: Ability to disable dimensions 2019-05-18 23:47:42 +05:30
Suraj Shetty
8a178d6f30 fix: Update call summary dialog 2019-05-18 16:11:29 +05:30
Anurag Mishra
fc86df6453 fix: Allow return if delivery note or sales order is required in selling settings(v12) (#17631)
* fix: Allow retrun if delivery note or sales order is required in selling settings

* fix: combined condition

* style: refactor
2019-05-18 13:03:08 +05:30
Rushabh Mehta
249d47cd1c fix(readme): logo URL 2019-05-18 10:53:01 +05:30
Syed Mujeer Hashmi
045194c230 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-05-17 16:26:31 +05:30
Deepesh Garg
2cab66cda1 Merge pull request #17658 from deepeshgarg007/territory_item_code_develop
fix: Inactive Sales Item report fixes
2019-05-17 16:20:30 +05:30
deepeshgarg007
a4c9134d33 fix: Inactive Sales Item report fixes 2019-05-17 16:19:15 +05:30
Deepesh Garg
e796d2844c fix: Unable to create item variant based on manufacturer (#17652)
* fix: Unable to create item variant against manufacturer

* fix: Spacing fixes

* fix: Spacing fixes in item.js
2019-05-17 15:39:22 +05:30
Nabin Hait
9764eff1a4 Merge branch 'develop' into gle-opening-stock-reco-dev 2019-05-17 14:34:39 +05:30
Himanshu Warekar
ab596c7236 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-17 11:50:58 +05:30
rohitwaghchaure
c356fef9c4 Merge pull request #17599 from Anurag810/bom_items_and_scraps
feat: added report for showing complete hierarchy of bom with item details and scraps
2019-05-17 11:22:12 +05:30
deepeshgarg007
705c03c093 fix: Added dashboard and module links for accounting dimensions 2019-05-17 10:23:00 +05:30
Himanshu Warekar
6668e1b8fe Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-05-17 08:17:33 +05:30
Himanshu Warekar
628ea47c6d Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-17 00:48:23 +05:30
Suraj Shetty
dd6b70c7cd feat: Show contact on incoming call 2019-05-16 23:55:35 +05:30
Rohan
a094560b8b fix(tests): Save batch instead of submitting it (#17637) 2019-05-16 19:44:55 +05:30
Rushabh Mehta
8ec3718aba Merge pull request #17625 from rmehta/link-preview-item-task
fix: link preview for item and task
2019-05-16 19:35:05 +05:30
Nabin Hait
06c8cf4321 fix: BOM Item rate based on uom conversion factor and exchange rate 2019-05-16 19:23:00 +05:30
Anurag Mishra
15e2546846 Merge branch 'develop' into bom_items_and_scraps 2019-05-16 18:24:04 +05:30
Nabin Hait
3f119ec256 fix: GL Entry for opening stock reconciliation 2019-05-16 17:29:10 +05:30
Anurag Mishra
dd5d4c49c4 fix: indent 2019-05-16 17:08:44 +05:30
rohitwaghchaure
cca5c45ebd Merge pull request #17638 from rohitwaghchaure/changed_fieldtype_from_data_to_float
fix: changed fieldtype from data to float
2019-05-16 17:04:51 +05:30
Rohit Waghchaure
cb4e28fb31 fix: changed fieldtype from data to float 2019-05-16 17:01:05 +05:30
Shivam Mishra
8a976ba8ab feat: LMS is now compatible with Frappe Theme (#17600)
* style: UI fixes for frappe_theme compatibility

* chore: minor ui fixes
2019-05-16 16:38:13 +05:30
Saurabh
1bcdb094ea Merge pull request #17630 from nabinhait/multi-fixes-dev
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
rohitwaghchaure
144e60a234 Update bom_items_and_scraps.py 2019-05-16 15:03:30 +05:30
Anurag Mishra
39c80789c9 Merge branch 'develop' into bom_items_and_scraps 2019-05-16 14:59:38 +05:30
Rushabh Mehta
a02ab2d3d7 Merge pull request #17635 from nabinhait/add-multiple-items-dev
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce feat: Added 'Add Multiple' options in all sales / purchase transactions 2019-05-16 14:54:05 +05:30
Anurag Mishra
b921d9f94d Merge branch 'develop' into bom_items_and_scraps 2019-05-16 14:24:16 +05:30
rohitwaghchaure
dbecd9d45e Merge pull request #17476 from Anurag810/subs
feat: subcontracting report
2019-05-16 14:06:44 +05:30
Nabin Hait
2a8c463079 fix: show tasks in project order by due date and status 2019-05-16 13:46:05 +05:30
Nabin Hait
b90fc7fc0d fix: Get bank account on selection of payment mode in Loan 2019-05-16 13:45:54 +05:30
Nabin Hait
ab1c43dbee fix: To allow creation of sales invoice without customer 2019-05-16 13:45:36 +05:30
Suraj Shetty
03c3bd5f4a feat: Open modal in realtime for incoming call 2019-05-16 13:39:50 +05:30
Anurag Mishra
6f619e2bbf Merge branch 'develop' into subs 2019-05-16 12:52:26 +05:30
Nabin Hait
6b9d64ce1d refator: Payroll processing and tax calculation (#17617)
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Anurag Mishra
b6a4a02dc2 Merge branch 'develop' into subs 2019-05-16 10:48:21 +05:30
Himanshu
0e31089af6 validate: if additional salary exists (#17529) 2019-05-16 10:35:02 +05:30
Rushabh Mehta
fd6ae67b16 fix: link preview for item and task 2019-05-16 10:25:27 +05:30
Prasad Ramesh
067d3c0c09 fix: made Sales Partner Comission report visible in Selling module (#17602) 2019-05-16 10:18:02 +05:30
Suraj Shetty
d382f1d470 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-16 09:47:17 +05:30
Mangesh-Khairnar
afb0c4aa43 fix: delete entry on cancellation of transaction 2019-05-15 21:50:34 +05:30
Mangesh-Khairnar
f8f02c508d feat: create leave ledger entry on leave encashment creation 2019-05-15 21:50:06 +05:30
Mangesh-Khairnar
50037f8609 fix: consider min days remaining as remaining leaves 2019-05-15 21:49:27 +05:30
Anurag Mishra
1a98cce3a4 Merge branch 'develop' into subs 2019-05-15 16:40:03 +05:30
Mangesh-Khairnar
6ba9a128e7 feat: calculate leave balance using ledger entries 2019-05-15 15:53:54 +05:30
Mangesh-Khairnar
964deaca96 test: creation of ledger entries on application submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
201aeeb20d test: creation of ledger entries on allocation submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
170b8dded8 fix: expiry logic for carry forwarded allocation 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
9bb4b8e8b2 feat: create expiry ledger entry on allocation period completion 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
cf8f4bda8f fix: skip application fetch for non allocation records 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
783bd89413 feat: handle cancellation workflow for leave application 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5448edff2c feat: delete cancelled allocation from ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
01490f1560 feat: add cancellation workflow for leave allocation ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5ad83c06c2 feat: add ledger entries on leave addition 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
679371e397 feat: get carry forwarded leaves via ledger entries 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
2b421c39b5 feat: add transaction details in ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
1de990b2ac feat: create leave ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5e2b067107 feat: display carry forwarded allocation days and total leaves allocated 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0abf5d340c fix: carry forwarded allocation period validation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d01863707c test: pass leave type as params 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
70cf4a6796 feat: validate leave allocation period to be within expiry limits 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
99c9cfaaed feat: generate leave allocation for carry forwarded leaves 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
4badca54af feat: validate leave expiry days 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0c0bfb1ef0 feat: calculate carry forward leaves allocation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d6c5b6320f feat: add a field for conditionally displaying carry forwarded leave 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
e46d3a87ea feat: set carry forwarded leave allocation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
c28d2e4b2a test: create leave allocation check 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
bd3b3ea12c test: create leave type 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
7c6b6eae5b feat: set leave allocation on carry forward check 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
1208ca6a36 feat: add old leaves to track carry forward leave allocation 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
c182a5687e feat: add validation for carry forward leave expiry 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
fd53c64d5d feat: create carried forward leave expiry option 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
6e3586423f fix: multiple changes 2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3 fix: Status updater fixes in PO and SO and test coverage for return (#17491)
* fix: Status updator fixes in sales and purchase cycle

* fix: Test cases for return in so and po

* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766 fix: Create property setter for budget if dimension is created 2019-05-15 12:20:37 +05:30
Saurabh
9da57d79b5 fix: reload docs before creating custom fields (#17586) 2019-05-15 11:39:41 +05:30
Mohamed Al Zubaidi
4c0f754a96 Fix typos (#17601) 2019-05-15 11:38:56 +05:30
Karthikeyan S
c3779851e4 fix(HR Settings): Unable to save HR Settings (#17608) 2019-05-15 11:38:20 +05:30
rohitwaghchaure
d07a3e1de2 fix: limit offset was missing in the get_delivery_notes_to_be_billed method (#17611) 2019-05-15 07:46:28 +05:30
rohitwaghchaure
32d91b2c00 fix: not able to create the sales invoice without item code (#17612) 2019-05-15 07:41:44 +05:30
Himanshu
abcb6aea00 fix: do not remove assignment when closed (#17613) 2019-05-14 20:07:53 +00:00
Himanshu
8b2a76a03a Merge branch 'develop' into sla_fix 2019-05-15 00:08:45 +05:30
sahil28297
adf6dcd74a Merge pull request #17603 from netchampfaris/fix-v12-setup
fix: Clear messages during setup fixtures
2019-05-14 20:11:38 +05:30
Mangesh-Khairnar
cf71a84976 style: formatting changes 2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736 fix: reload doc on generation of text file 2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6 feat: add account field in payment order 2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
557419a745 feat: load company bank account 2019-05-14 18:30:19 +05:30
Mangesh-Khairnar
d9140dc772 feat: add party bank account field 2019-05-14 18:28:24 +05:30
Mangesh-Khairnar
6175eb2cf9 feat: add validation for fields 2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528 fix: Clear messages during setup fixtures 2019-05-14 16:21:09 +05:30
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
Anurag Mishra
52f31d211d Merge branch 'develop' into bom_items_and_scraps 2019-05-14 15:29:43 +05:30
Shivam Mishra
621cdeb36a Merge pull request #17592 from scmmishra/acad-fixes
fix: bug fixes in LMS
2019-05-14 15:20:22 +05:30
Anurag Mishra
f1f2a3eed0 feat: added report for showinrg complete hierarchy of bom with item details and scraps 2019-05-14 15:04:26 +05:30
Saurabh
1d90ebb16a Merge pull request #17579 from rmehta/remove-feedback-trigger
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
Deepesh Garg
1f02fcdf89 Merge pull request #17597 from deepeshgarg007/territory_group_fixes_develop
fix: Make territory filter mandatory
2019-05-14 14:37:39 +05:30
deepeshgarg007
d9a22726f1 fix: Make territory filter mandatory 2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19 fix: test for course 2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074 fix: show video duration and publish date only if data exists 2019-05-14 12:02:51 +05:30
Deepesh Garg
bbdd737b5c Merge pull request #17590 from deepeshgarg007/inactive_items_row_develop
fix: Do not append row if item is sold within days since last ordered
2019-05-14 11:56:59 +05:30
Deepesh Garg
571c5c8bf1 Merge branch 'develop' into inactive_items_row_develop 2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c chore: show description on course card 2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0 chore: Minor code improvements 2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b fix: Video not found bug 2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d feat: Allow disbaling LMS (#17587) 2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f fix: Do not append row if item is sold within days since last order 2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
Anurag Mishra
73706f85aa feat: Bank remittance report for tracking payroll-entry transactions (#17013)
* feat: Bank remittance report for tracking payroll-entry transactions

* feat: show Company bank account and bank name

* feat: Added Permissions to view report

* feat: Validated report only if debit account is present

* fix: query optimisation

* feat: Added From date and To date filters

* fix: code optimisation

* fix: requested changes

* fix: requested changes and refactor

* style: indentation

* style: Formatting

* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
3866e132f7 Merge pull request #17582 from asbasawaraj/blanket_order_in_selling_module_page
feat: Added Link to Blanket Order in Selling Module Page
2019-05-13 16:52:23 +05:30
Deepesh Garg
dbf9251324 Merge branch 'develop' into blanket_order_in_selling_module_page 2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10 feat: Added Link to Blanket Orded in Selling Module Page 2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859 fix: remove link to feedback trigger 2019-05-13 14:19:09 +05:30
Saurabh
9706aaab65 Merge pull request #17556 from Alchez/develop-lead-import-fix
feat(crm): Allow leads to be imported without person name
2019-05-13 12:10:12 +05:30
Saurabh
1ab0b78ece Merge pull request #17569 from Mangesh-Khairnar/training-event-fix
feat: validate training event period
2019-05-13 11:47:39 +05:30
Suraj Shetty
c24ace48a6 Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
Deepesh Garg
aeb864af5a Merge pull request #17577 from deepeshgarg007/territory_items_develop
fix: Show all territories and items in inactive sales item report
2019-05-12 20:43:49 +05:30
deepeshgarg007
0c874d915b fix: Indentation fixes 2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63 fix: Show all territories and items in inactive sales item report 2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
b4e8128fdb feat: validate training event period 2019-05-11 23:26:47 +05:30
Mangesh-Khairnar
4df61b1495 fix: join multiple emails 2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
cd4289e10e feat: remove button on import of an order 2019-05-11 20:04:03 +05:30
Himanshu Warekar
c4fe98391b fix: set now_datetime 2019-05-11 09:38:08 +05:30
Himanshu Warekar
a8f9698082 fix: call the correct function 2019-05-11 00:01:43 +05:30
Himanshu Warekar
6e6148be39 fix: calculate variance 2019-05-10 23:49:42 +05:30
Rohan Bansal
9778ff8ab3 feat(crm): Allow leads to be imported without person name 2019-05-10 16:09:48 +05:30
Suraj Shetty
b68ae15dec fix: Check permissions before renaming the account 2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05 fix: Show "Merge Account" button only to users with write access 2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382 fix: test cases 2019-05-10 14:31:07 +05:30
Saurabh
a15908f6a3 Merge pull request #17542 from rohitwaghchaure/project_update_statue_emails_sending_frequestly_develop
fix: project update status emails sent frequently
2019-05-10 13:24:50 +05:30
rohitwaghchaure
490411ba28 Update project.py 2019-05-10 12:03:20 +05:30
Saurabh
b10392134d Merge pull request #17544 from surajshetty3416/improve-item-search-perf
perf: Index show_in_website field for faster item search
2019-05-10 11:54:54 +05:30
rohitwaghchaure
8b7a5133a6 Merge pull request #17522 from rohitwaghchaure/invoiced_items_gross_margin_api_develop
feat: Get invoiced item's gross margin using API
2019-05-09 19:57:02 +05:30
Rohit Waghchaure
4a267b9340 fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount 2019-05-09 19:52:53 +05:30
Suraj Shetty
2df91addd7 perf: Index show_in_website field for faster item search 2019-05-09 19:19:34 +05:30
Rohit Waghchaure
6b9543b213 fix: project update status emails sent frequently 2019-05-09 19:06:31 +05:30
Aditya Hase
5f1632cf1f fix(hr): Use event_status instead of status
Training Feedback DocType has event_status field (not status)
This was broken since PR #10379, PR #17197 made this failure explicit.
2019-05-09 19:00:05 +05:30
Saurabh
13955e3a68 Merge pull request #17533 from sahil28297/sync_site_develop
feat(sync_site): return more data in level
2019-05-09 17:34:58 +05:30
sahil28297
ce82e4fd54 Merge branch 'develop' into sync_site_develop 2019-05-09 14:48:39 +05:30
deepeshgarg007
9a05ce10d9 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-09 14:43:45 +05:30
Deepesh Garg
828dd6d328 Merge pull request #17531 from deepeshgarg007/gst3b-precision-fix
fix: Minor fixes in gstr reports
2019-05-09 14:41:57 +05:30
Sahil Khan
73e281d339 feat(sync_site): return more data in level 2019-05-09 14:32:15 +05:30
Mangesh-Khairnar
93c9a99548 style: change formatting 2019-05-09 12:23:24 +05:30
deepeshgarg007
19c8802971 fix: Precision fixes in gstr3b-report 2019-05-09 12:15:56 +05:30
deepeshgarg007
2097916d9e fix: Invoice type fixes in gstr-1 report 2019-05-09 12:15:29 +05:30
Saurabh
2b6b504f30 Merge branch 'develop' into invoiced_items_gross_margin_api_develop 2019-05-09 12:06:12 +05:30
Himanshu Warekar
488432c0e8 fix: display sla status 2019-05-09 11:50:09 +05:30
rohitwaghchaure
4d2c307d6d Merge pull request #17475 from netchampfaris/item-variant-attributes-optional
fix: Allow variant attributes to be optional
2019-05-09 00:54:45 +05:30
Deepesh Garg
35226b1f32 Merge pull request #17415 from deepeshgarg007/notification
feat: Track purchase receipt status in material request
2019-05-09 00:03:34 +05:30
Shivam Mishra
374999b048 feat: Password protected salary slips (#17380)
* feat: Added check for encrypting salary slips and password policy field

* feat: make password policy mandatory if encrypt option is selected

* feat: added password logic to email_salary_slip

* fix: import error

* chore: Minor enhancement to validations in salary slip

* fix: travis patch

* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Mangesh-Khairnar
644e181729 feat: remove first row if empty 2019-05-08 16:17:31 +05:30
rohitwaghchaure
bb439f7662 Merge pull request #17520 from rohitwaghchaure/added_validation_for_stock_entry_purpose_develop
fix: job card issue, added validation in the stock entry
2019-05-08 16:16:52 +05:30
Mangesh-Khairnar
3ca8976037 feat: add validation for fetching doc status 2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805 feat: add status field to create payment order 2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858 feat: assign pe status on creation of payment order 2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf fix: display generate txt on submission 2019-05-08 15:58:26 +05:30
Mangesh-Khairnar
0b2fc4fbc1 fix: multiple changes 2019-05-08 15:57:29 +05:30
Rohit Waghchaure
7bee502d72 fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin 2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d feat: Get invoiced item's gross margin using API 2019-05-08 15:38:05 +05:30
Rohit Waghchaure
0cb7024e55 fix: job card issue, added validation in the stock entry 2019-05-08 15:14:12 +05:30
Saurabh
77bf60e1ac Merge pull request #17384 from Mangesh-Khairnar/procurement-tracker
feat: Procurement Tracker Report
2019-05-08 13:44:29 +05:30
Saurabh
27e7ae6773 Merge branch 'develop' into procurement-tracker 2019-05-08 11:30:38 +05:30
deepeshgarg007
321124aa72 fix: Resolve merge conflict in json files 2019-05-08 10:33:08 +05:30
deepeshgarg007
e13a56cc80 Merge branch develop into notification 2019-05-08 10:16:30 +05:30
Himanshu Warekar
5aba75d74d fix: show priority change dialog 2019-05-08 00:22:26 +05:30
Himanshu Warekar
91478181cb Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-07 23:43:06 +05:30
Himanshu Warekar
fc3232a9db fix: compare timedeltas directly 2019-05-07 23:42:38 +05:30
Anurag Mishra
c3dcf02784 test: subcontracted raw materials to be recieved 2019-05-07 17:43:48 +05:30
Anurag Mishra
58bd2df834 fix: code refactor 2019-05-07 17:42:22 +05:30
Anurag Mishra
9acb2bf28f test: for subcontracting item be received 2019-05-07 14:38:30 +05:30
Faris Ansari
9a45bd11d6 Merge branch 'develop' into item-variant-attributes-optional 2019-05-07 14:25:03 +05:30
Faris Ansari
fde4fa7b60 fix(test): Convert values to list 2019-05-07 13:29:00 +05:30
Faris Ansari
23fecc0dbb perf: Task import with Project (#17496)
When tasks are imported with their Project set, import slows down as
number of tasks increase. This is largely due to `load_tasks` being
called in Project which is only required when Form loads. So, we can
skip it during import.

Also, converted some get_doc calls to get_cached_doc.
2019-05-07 12:38:24 +05:30
Faris Ansari
a90fe810b3 fix(UX): Cancel tasks if project is cancelled (#17497) 2019-05-07 12:37:38 +05:30
Mangesh-Khairnar
b8d0dec7f5 feat: filter bank from company account 2019-05-07 11:29:20 +05:30
Himanshu Warekar
1bfef6a600 fix: code fixes 2019-05-07 10:46:52 +05:30
Himanshu Warekar
9563835b61 fix: miscellaneous fixes 2019-05-07 10:40:02 +05:30
Himanshu Warekar
cf37e401f8 fix: change agreement status only if ongoing 2019-05-07 10:27:01 +05:30
Saurabh
3083d8d453 Merge pull request #17503 from netchampfaris/fix-product-configurator
fix: Dont include disabled items in cache
2019-05-07 09:12:28 +05:30
Himanshu Warekar
c5999154e6 fix: test cases and use orm 2019-05-06 23:43:16 +05:30
Mangesh-Khairnar
e8bea2e936 feat: set payment order type on mapping 2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce feat: show generate txt button for payment entry 2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
27ea171187 style: change formatting 2019-05-06 16:37:34 +05:30
Mangesh-Khairnar
66a3c99800 feat: fetch custom fields for remittance creation 2019-05-06 16:26:05 +05:30
Mangesh-Khairnar
9215de02c5 feat: add india specific custom fields in company 2019-05-06 16:24:10 +05:30
Faris Ansari
ff9177a6ce fix: Handle attribute filter when no items found 2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed fix: Dont include disabled items in cache 2019-05-06 15:59:34 +05:30
Mangesh-Khairnar
09d4933edb fix: filter pi item based on po completeion 2019-05-06 12:53:52 +05:30
Himanshu Warekar
aa0eaab3df fix: codacy 2019-05-06 01:35:11 +05:30
Himanshu Warekar
785f98efd9 minor: change autoname for sla 2019-05-06 00:43:38 +05:30
Himanshu Warekar
9faaa17d9d patch: fixes 2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1 fix: test cases for sla 2019-05-05 22:51:18 +05:30
Mangesh-Khairnar
525d8cefc1 fix: post process mapping 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b feat: generate file name 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b feat: check bulk update option 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8 feat: add advice row 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb fix: pass account paid information to postprocess 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
b89db7f5a8 feat: add logic to generate txt file 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2 feat: add payment entry field 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364 perf: improve mapping function speed 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478 feat: add generate txt file button for india region 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c feat: add mapping logic for creating payment order 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189 feat: create payment order from payment entry 2019-05-05 22:37:20 +05:30
Himanshu Warekar
fbb7ea4856 fix: patch fix 2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604 fix: patch fixes 2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191 patch: fix to migrate to new sla structure 2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831 patch: migrate to new sla structure 2019-05-05 12:31:04 +05:30
Himanshu Warekar
b3070ca765 fix: display sla indicators at the top 2019-05-05 12:19:08 +05:30
Himanshu Warekar
898ab61dd4 fix: Child table for priority 2019-05-04 23:16:02 +05:30
Himanshu
ac1ce5d205 fix: Remove Scheduling Tool if exists (#17473)
* fix: scheduling tool

* fix: patch for scheduling tool

* fix: remve drop table
2019-05-04 22:43:37 +05:30
Rohan
174aa24529 fix(stock): Allow expired batches to be flushed out of the system (#17478) 2019-05-04 22:41:05 +05:30
Rushabh Mehta
e12bedc0c2 fix: unlink task rather than deleting it (#17485) 2019-05-04 22:39:31 +05:30
Faris Ansari
14425575b7 fix: Rebuild cache in background (#17487) 2019-05-04 22:38:13 +05:30
Himanshu
5cf12a4640 fix(Purchase Order): fetch payment terms (#17121)
* fix: fetch payment terms

* fix: test fixes

* fix: test cases

* fix: test case

* fix: check for payment terms fetching

* fix: test cases

* refactor: fetch payment terms in account settings

* fix: add fetch terms to account settings
2019-05-04 22:37:35 +05:30
Himanshu Warekar
24442af9ae fix: use list comprehension 2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5 fix: calculate percentage only if sales team exist 2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347 fix: sales percentage equal to 100 2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c fix: python side validation 2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f fix: validate percentage total 2019-05-04 22:35:52 +05:30
deepeshgarg007
b4ad5c0158 feat: Ability to add custom dimensions 2019-05-04 20:29:21 +05:30
Rushabh Mehta
78827d8d79 Merge pull request #17484 from rmehta/fix-demo-style
fix(style): demo home page
2019-05-04 11:10:06 +05:30
Rushabh Mehta
2df16b1f9b fix(style): demo home page 2019-05-04 11:09:19 +05:30
Mangesh-Khairnar
e003cc8812 fix: filter out completed purchase receipt 2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a feat: add date range filters 2019-05-03 16:00:02 +05:30
Anurag Mishra
d0cdb4a1e9 feat: subcontracting report 2019-05-03 14:05:29 +05:30
Faris Ansari
ab14892fc5 fix: Variant naming if optional attributes 2019-05-03 13:57:20 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Himanshu Warekar
00a494f07b fix: change sla on priority 2019-05-03 12:44:35 +05:30
Deepesh Garg
8ca3df7aac Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop
fix: Inactive sales items report fix
2019-05-03 11:54:05 +05:30
deepeshgarg007
3c1b9aa77b fix: Remove patch 2019-05-03 09:47:38 +05:30
Nabin Hait
f13abe8332 Merge pull request #17464 from Mangesh-Khairnar/task-unlink
feat: unlink task from project on task deletion
2019-05-03 09:20:34 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Nabin Hait
ae0e1da091 Merge pull request #17461 from nabinhait/project-billing-summary-dev
refactor: Project and billing summary
2019-05-02 21:48:28 +05:30
Faris Ansari
b9dc4687dc fix: Remove parens 2019-05-02 20:14:16 +05:30
deepeshgarg007
9ae112bbfc fix: Inactive items report fix 2019-05-02 19:38:15 +05:30
Mangesh-Khairnar
ffd4990a70 feat: unlink task from project on task deletion 2019-05-02 19:19:03 +05:30
Nabin Hait
73041269e9 refactor: Project and billing summary 2019-05-02 18:13:31 +05:30
Suraj Shetty
8b0588deaf feat: Init call summary popup 2019-05-02 14:59:44 +05:30
Nabin Hait
bd0d10f82a Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev
fix: Multilingual handling in woocommerce integration
2019-05-02 12:57:34 +05:30
Nabin Hait
218d551c99 Merge pull request #17105 from nabinhait/gst-category-fieldtype
fix: Set GST Category fieldtype as Select in invoice
2019-05-02 12:43:09 +05:30
Nabin Hait
e1de2d64e5 Merge pull request #17450 from nabinhait/auto-account-creation-company-tree-dev
fix: Validate parent account of child company while creating new account based on parent company
2019-05-02 12:40:46 +05:30
Saurabh
7c5d3873fe Merge branch 'develop' into auto-account-creation-company-tree-dev 2019-05-02 12:01:46 +05:30
Nabin Hait
5a7c5bc4dd Merge pull request #17435 from rmehta/coa-sorting
fix(minor): chart of accounts sorting and message
2019-05-02 11:57:08 +05:30
Saurabh
321c0feed8 Merge branch 'develop' into woocommerce-multilingual-fix-dev 2019-05-02 11:46:53 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
3d64a5da5e Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30
Nabin Hait
9cce19a65c Merge pull request #17438 from netchampfaris/cart-route
fix(cart): Don't use window.open as it can be blocked
2019-05-02 03:17:58 +05:30
Nabin Hait
62fce0a6e5 Merge pull request #17432 from netchampfaris/task-depends-on-code
fix: Set depends_on_tasks to Code
2019-05-02 03:12:33 +05:30
Nabin Hait
c0fdb80486 Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO 2019-05-02 01:00:12 +05:30
Nabin Hait
e93702032b Merge branch 'develop' into task-depends-on-code 2019-05-02 00:59:23 +05:30
Nabin Hait
bbcf43961c Merge branch 'develop' into cart-route 2019-05-02 00:59:13 +05:30
Nabin Hait
7ca243094e Merge branch 'develop' into coa-sorting 2019-05-02 00:58:56 +05:30
Nabin Hait
d539def25d Update campaign.json 2019-05-02 00:44:29 +05:30
Nabin Hait
9d04b67f46 fix: Validate parent account of child company while creating new account based on parent company 2019-05-01 20:26:36 +05:30
Nabin Hait
4ee2cec8e2 Merge pull request #17444 from nabinhait/work-order-bom-image-dev
feat: Added item image in work order and bom
2019-05-01 19:31:15 +05:30
Nabin Hait
9ccdf594c3 Merge pull request #17445 from rmehta/refactor-child-tables
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
Nabin Hait
64346c08c6 Merge pull request #17446 from netchampfaris/product-configurator-skip-disabled-items
fix: Skip disabled items in product configurator
2019-05-01 19:27:59 +05:30
Nabin Hait
c64cc331b7 Update item_variants_cache.py 2019-05-01 19:27:23 +05:30
Nabin Hait
284e5a284e Update item_variants_cache.py 2019-05-01 19:26:56 +05:30
Deepesh Garg
a475ddc4b9 Merge pull request #17437 from deepeshgarg007/rename_report_develop
fix: Rename Inactive Items report to Inactive Sales Items
2019-05-01 19:24:59 +05:30
Nabin Hait
240008d7c6 fix: Multilingual handling in woocommerce integration 2019-05-01 19:18:40 +05:30
Faris Ansari
4ca948d7ea fix: Skip disabled items in product configurator 2019-05-01 18:19:24 +05:30
deepeshgarg007
1cfe96193f Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop 2019-05-01 18:14:07 +05:30
deepeshgarg007
75afff2f6d Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-05-01 18:05:11 +05:30
Rushabh Mehta
c3aecb1fbd fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table 2019-05-01 18:04:22 +05:30
deepeshgarg007
c5e6886937 feat: Notification for material request receipt 2019-05-01 18:03:40 +05:30
Nabin Hait
621006642c feat: Added item image in work order and bom 2019-05-01 17:20:21 +05:30
Nabin Hait
dc86bc756e Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
fix: Always fetch exchange rate from ref document
2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890 Merge pull request #17424 from adityahase/fix-py3-misc
fix: Python 3 compatibility fixes
2019-05-01 16:45:11 +05:30
deepeshgarg007
bffa060ff6 Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-05-01 16:33:11 +05:30
Nabin Hait
6d9334810e fix: reverted fetch from as the field does not exists for some ref doctypes 2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0 fix: Always fetch exchange rate from ref document 2019-05-01 15:37:03 +05:30
Nabin Hait
0af45b41d7 Merge pull request #17426 from adityahase/fix-py3-regional-france
fix(py3): Undefined variable
2019-05-01 15:05:24 +05:30
Nabin Hait
41423815a7 Merge pull request #17431 from nabinhait/deferred-accounting-long-job-dev
fix: moved deferred accounting monthly job to long job
2019-05-01 15:04:12 +05:30
Faris Ansari
358329d7df fix: Hide button and cart after success 2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16 fix(cart): Don't use window.open as it can be blocked
window.open calls are interpreted as popups by some browsers and are
blocked.

Also, route to Quotation web view instead of printview.
2019-05-01 14:32:15 +05:30
Nabin Hait
89b06132cd minor fix 2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3 fix: Set GST Category fieldtype as Select in invoice 2019-05-01 14:18:37 +05:30
deepeshgarg007
6dfbd2bb64 fix: Delete old report 2019-05-01 14:17:16 +05:30
deepeshgarg007
db999e293b fix: Rename Inactive Items report to Inactive Sales Item 2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11 fix(minor): chart of accounts sorting and message 2019-05-01 13:53:05 +05:30
Nabin Hait
cc6ee8e16e Merge pull request #17154 from nabinhait/item-discount
fix: Calculate rate based on discount on server side, only if not rate or pricing rule applied
2019-05-01 13:44:21 +05:30
Nabin Hait
4c724dc3cb Merge pull request #17428 from nabinhait/ss-fixes-dev
Few fixes in payroll
2019-05-01 13:44:05 +05:30
Nabin Hait
991b95fbec Merge pull request #17434 from nabinhait/payment-entry-exchange-rate-dev1
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:35:12 +05:30
Nabin Hait
316c3b3f9d fix: Fetch exchange rate from invoice on server side 2019-05-01 13:34:17 +05:30
Faris Ansari
7899412d9e fix: Set depends_on_tasks to Code
It tracks a list of dependent tasks which can exceed 140 characters
2019-05-01 13:31:56 +05:30
Nabin Hait
b9b2a06847 moved deferred accounting monthly job to long job 2019-05-01 12:50:23 +05:30
rohitwaghchaure
6687c5a9fc Merge pull request #17427 from adityahase/fix-py3-asset-value-adjustment
fix(py3): Undefined variable
2019-05-01 12:25:33 +05:30
Nabin Hait
b8103ac077 Merge branch 'develop' into item-discount 2019-05-01 12:23:30 +05:30
Nabin Hait
5762a5d8b6 fix: Null handling 2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86 fix: a few fixes in payroll 2019-05-01 12:17:47 +05:30
Aditya Hase
e7d712934f Merge branch 'develop' into fix-py3-asset-value-adjustment 2019-05-01 11:55:35 +05:30
Aditya Hase
5bbff9de6c Merge branch 'develop' into fix-py3-regional-france 2019-05-01 11:55:32 +05:30
Aditya Hase
ee0093c593 Merge branch 'develop' into fix-py3-misc 2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c fix: Python 3 compatibility fixes
import reduce from functools

Undefined variable
2019-05-01 11:52:37 +05:30
Aditya Hase
1db334317d fix(py3): Undefined variable 2019-05-01 11:51:04 +05:30
Aditya Hase
97ad454525 fix(py3): Undefined variable 2019-05-01 11:50:05 +05:30
Nabin Hait
39f58ae92b Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
fix: allow_import_of_bank_account_by_account_manager
2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf Merge pull request #17388 from ashish-greycube/correct_party_type_values
fix: show only party_type doctypes in Party Type field of bank account
2019-05-01 11:15:02 +05:30
Nabin Hait
7516e7e66e Merge pull request #17082 from Anurag810/aahi_loan_report
feat: Loan repayment report
2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022 Update loan_repayment.json 2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
cc8e2b6aca test: pass filters to execute 2019-05-01 10:03:57 +05:30
Nabin Hait
dff4cce8fd Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix
fix(salary-register): Track doj for non active employee
2019-05-01 09:57:28 +05:30
Karthikeyan S
6b77f6edf3 fix: woocommerce settings patch (#17422)
(cherry picked from commit 7df8c0ef82)
2019-05-01 09:07:44 +05:30
Faris Ansari
1e55c2e713 Remove old style custom scripts (#17077)
* fix: Move Newsletter script from frappe to erpnext

* fix: Remove old style client scripts

* C-Form

* fix: Cost Center

* fix: Fiscal Year

* fix: Monthly Distribution

* fix: Payment Gateway Account

* fix: Pricing Rule

* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575 fix: Price list conversion for other UOM from stock UOM item price (#17386)
* fix: Price list for UOM other than stock UOM

-Fixes conversion from default UOM item price to  other UOMs

* fix: Typo
2019-04-29 23:18:47 +05:30
Faris Ansari
4b21225cf4 fix: Map item_code to title (#17403)
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
2019-04-29 22:41:48 +05:30
Faris Ansari
61b4afc3c5 perf: Order by name instead of parent (#17404)
Changing the order by column reduced the query time from 60s to 12s
2019-04-29 22:41:24 +05:30
Basawaraj Savalagi
d4585efc6a feat: Additional fields in campaign 2019-04-29 22:12:50 +05:30
deepeshgarg007
36e161df74 Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-29 21:44:51 +05:30
deepeshgarg007
f2fb0e03e6 fix: Add status for partial received 2019-04-29 21:42:48 +05:30
Rushabh Mehta
9f660267c1 Merge pull request #17397 from Thunderbottom/manufacturing-demo-fix
fix(demo): make demo work again
2019-04-29 15:18:28 +05:30
Rushabh Mehta
1efade3408 fix(task): weight editable 2019-04-29 15:00:20 +05:30
Aditya Hase
be12603f1d feat: Tally Migration (#17405)
feat: Tally Migration
2019-04-29 13:27:05 +05:30
Syed Mujeer Hashmi
b146df6460 feat: Student Group with Student Category filter
The Student Category field is added to the Student Group doctype.The
students are fetched from Program Enrollment with added Student Category.
This helps in creating student group based on Program,Batch and Student
Category.Which helps in creating fee schedule with fee structures
defined based on student category.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2019-04-29 13:16:00 +05:30
Aditya Hase
8afeda924d fix: Use all address lines instead of only first two 2019-04-29 13:09:23 +05:30
Mangesh-Khairnar
513e3f97e5 fix(salary-register): track doj for non active employee 2019-04-29 12:17:49 +05:30
Aditya Hase
ba61be93ae refactor: Major changes 2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784 feat(tally): Preprocess and create items and uoms 2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b fix(tally): Use LEDSTATENAME instead of STATENAME 2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638 feat(tally): Preprocess and create parties and addresses 2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82 feat(tally): Create chart of accounts from tally master data 2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad feat(tally): Preprocess master data to generate COA 2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0 feat(tally): Add Tally Migration DocType 2019-04-28 19:24:58 +05:30
Mangesh-Khairnar
96661ba847 feat: add filters for multiple company operation 2019-04-28 17:11:28 +05:30
Chinmay Pai
b503896594 fix(demo): make demo work again
definitely not a maga rebranding.

* import erpnext and set default company for accounts
* replace job card start/end date with job card time log
* create a doc for lost_reason
* pass opportunity/quotation lost_reason as a list of dicts
* fix company in stock reconciliation

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-04-27 01:39:50 +05:30
deepeshgarg007
c23b70950e Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-26 16:43:06 +05:30
Mangesh-Khairnar
9cd9671bb5 fix: minor changes 2019-04-26 16:02:25 +05:30
ashish-greycube
e4e8197f46 codacy review 2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03 fix : allow_import_of_bank_account_by_account_manager 2019-04-26 12:42:14 +05:30
ashish-greycube
4707ad2029 fix: copy_payment_schedule_from_quot_to_SO 2019-04-26 12:14:40 +05:30
rohitwaghchaure
fa626bd3ab Merge pull request #17372 from rohitwaghchaure/fix_straight_line_asset_depreciation_develop_v12
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-26 12:04:32 +05:30
ashish-greycube
467609b193 show only party_type doctypes in Party Type field of bank account 2019-04-26 11:35:04 +05:30
Shivam Mishra
53493bd67d Merge pull request #17383 from scmmishra/lms-fixes-1
fix: Minor UI fixes in LMS
2019-04-26 11:10:10 +05:30
Shivam Mishra
377b230e41 Merge branch 'develop' into lms-fixes-1 2019-04-26 08:42:33 +05:30
Mangesh-Khairnar
da7b1673c3 test: track pi and pr changes 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
869544c0bc fix: add mapped records as functions 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
438fa620b0 feat: fetch purchase invoice and purchase receipt records for actual cost calculation 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
fcd0edf415 test: compare expected data to generated data 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
46b9204e9d feat: fetch data from budget records for cost estimation 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
5de08f71c5 feat: fetch all required fields from po 2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
69909c0f51 feat: create procurement tracker report 2019-04-26 01:31:16 +05:30
Nabin Hait
4fcefda6c7 Merge pull request #17332 from deepeshgarg007/automatic_so_po
feat: Automatic inter company Sales and Purchase order
2019-04-26 00:24:08 +05:30
Nabin Hait
5c4b7b32a1 Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic
fix: Order Item attribute values dynamically
2019-04-26 00:21:39 +05:30
Nabin Hait
4c31acf5e4 Merge pull request #17382 from nabinhait/tax-exemption-dev
refactor: Employee Tax Exemption (develop)
2019-04-26 00:20:46 +05:30
Nabin Hait
ec7a18737b fix: test cases 2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d fix: test cases 2019-04-25 21:42:26 +05:30
Nabin Hait
1d21d89d2f Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
fix: Trial balance finance book issue
2019-04-25 20:34:38 +05:30
Nabin Hait
c245ed88b5 Merge pull request #17379 from nabinhait/pos-advance-dev
fix: Don't allocate advance if pos
2019-04-25 20:33:41 +05:30
Nabin Hait
49446ba760 fix: test cases 2019-04-25 19:54:49 +05:30
Shivam Mishra
9fe7257bfc fix (ui): refactored breadcrumbs 2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb fix (ui): Card layout 2019-04-25 19:33:22 +05:30
Shivam Mishra
37a55345fd feat: removed home page for lms role 2019-04-25 19:29:56 +05:30
Nabin Hait
04e7bf464f refactor: Employee Tax Exemption 2019-04-25 18:53:39 +05:30
Nabin Hait
e70696e111 Merge branch 'develop' into pos-advance-dev 2019-04-25 17:53:56 +05:30
Rohit Waghchaure
c181064782 fix: Trial balance finance book issue 2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8 fix: Don't allocate advance if pos 2019-04-25 17:49:38 +05:30
deepeshgarg007
ce809d57a2 Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po 2019-04-25 14:29:31 +05:30
deepeshgarg007
f34e4f0e36 fix: Test case for inter-company-transaction 2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4 fix: Commonfied code for inter-company-transaction 2019-04-25 14:28:19 +05:30
Faris Ansari
dd201b0797 fix: Order Item attribute values dynamically 2019-04-25 13:03:50 +05:30
Rohit Waghchaure
9c1fa77f4e fixed test cases 2019-04-25 11:57:27 +05:30
Rohit Waghchaure
691e03a36b fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined 2019-04-25 11:57:20 +05:30
Nabin Hait
07e005f963 Merge pull request #17350 from nabinhait/item-tax-patch
fix: create account if not exists in item tax patch
2019-04-25 10:40:46 +05:30
Nabin Hait
8784b0b134 Update move_item_tax_to_item_tax_template.py 2019-04-25 10:40:34 +05:30
deepeshgarg007
fef14182b7 Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po 2019-04-25 08:27:40 +05:30
Saif Ur Rehman
f1da53ed01 fix(Product Bundle Balance): Remove custom roles 2019-04-25 00:14:14 +05:00
Nabin Hait
2cb57dc3e7 Update move_item_tax_to_item_tax_template.py 2019-04-24 23:34:04 +05:30
Nabin Hait
d828f84da6 Merge pull request #17359 from netchampfaris/item-attribute-order-fix
fix: Item Attribute Order
2019-04-24 23:16:34 +05:30
Deepesh Garg
ea9c758648 Merge pull request #17331 from deepeshgarg007/inactive_items
feat: Inactive items report
2019-04-24 22:30:54 +05:30
Saif Ur Rehman
a012b63f9b style: linting 2019-04-24 16:17:40 +05:00
Saif Ur Rehman
adc738f55d style: linting 2019-04-24 14:43:46 +05:00
Saif Ur Rehman
35887f1c0a feat: Product Bundle Balance Report 2019-04-24 13:37:25 +05:00
Rushabh Mehta
3f1c7a5e5b Merge pull request #16810 from scmmishra/lms-beta-v2
feat: LMS Feature
2019-04-24 12:50:52 +05:30
Faris Ansari
90d7150859 Merge branch 'develop' into item-attribute-order-fix 2019-04-24 11:58:27 +05:30
Faris Ansari
cb7ca63979 fix: Item Attribute Order fix 2019-04-24 11:57:40 +05:30
scmmishra
bf7d13a7be Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-04-24 09:50:19 +05:30
Nabin Hait
0908907ae1 Merge branch 'develop' into aahi_loan_report 2019-04-24 09:37:52 +05:30
Nabin Hait
43324179d0 Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed
fix: Subject of Stock Entry feed
2019-04-24 09:35:18 +05:30
Nabin Hait
f593935026 Merge pull request #17330 from nabinhait/income-tax-period-factor-dev
fix: Income tax period factor considering joining and relieving date
2019-04-24 09:19:30 +05:30
Nabin Hait
08da372ae5 Merge branch 'develop' into income-tax-period-factor-dev 2019-04-24 09:19:21 +05:30
Nabin Hait
8d3644d826 Merge pull request #17351 from nabinhait/rounded-salary-tax
fix: Rounded tax amount in salary slip
2019-04-24 09:19:00 +05:30
Deepesh Garg
719dc506b9 Merge pull request #17352 from nabinhait/pos-advance
fix: don't allocate advances if POS
2019-04-24 08:18:05 +05:30
Deepesh Garg
7dddc0c5bf Merge branch 'develop' into fix-stock-entry-feed 2019-04-24 08:14:10 +05:30
Deepesh Garg
fa420c0309 Merge pull request #17245 from surajshetty3416/employee-skill-map
feat: Employee skill map
2019-04-24 08:10:07 +05:30
Deepesh Garg
12af1c3837 Merge branch 'develop' into employee-skill-map 2019-04-24 00:03:04 +05:30
Rohan
d12e9426bd fix(selling): Fix method to also consider return documents (#17340) 2019-04-23 23:08:26 +05:30
Nabin Hait
aa028d7856 fix: don't allocate advances if POS 2019-04-23 21:44:21 +05:30
Nabin Hait
c144f66dac Merge branch 'develop' into income-tax-period-factor-dev 2019-04-23 21:39:33 +05:30
Nabin Hait
90bca999dd Merge branch 'develop' into inactive_items 2019-04-23 21:39:22 +05:30
Nabin Hait
09438562d4 Merge branch 'develop' into fix-stock-entry-feed 2019-04-23 21:39:04 +05:30
Nabin Hait
80a5cb3dcc Merge branch 'develop' into item-tax-patch 2019-04-23 21:38:45 +05:30
Nabin Hait
acac41d62b Merge branch 'develop' into rounded-salary-tax 2019-04-23 21:38:16 +05:30
Nabin Hait
5e0bc20ab8 Merge pull request #17337 from nabinhait/travis-fix-dev
fix: Load doc before save
2019-04-23 21:35:18 +05:30
Audacityy
bf8d3658c9 Issue form reorder (#17346)
* fix: Issue form reorder
2019-04-23 18:55:42 +05:30
Nabin Hait
553a3ea7d2 fix: create account if not exists in item tax patch 2019-04-23 18:46:17 +05:30
Nabin Hait
1f61a1ecf2 minot fix 2019-04-23 18:44:57 +05:30
Nabin Hait
6592a6bcd4 Merge branch 'develop' into income-tax-period-factor-dev 2019-04-23 18:38:54 +05:30
Nabin Hait
8bbc0a0c3b Merge branch 'develop' into inactive_items 2019-04-23 18:38:44 +05:30
Deepesh Garg
cb2c13fa50 fix: Stock Ledger report fix (#17343) 2019-04-23 17:29:59 +05:30
Nabin Hait
24b4a8722e fix: Rounded tax amount in salary slip 2019-04-23 15:54:32 +05:30
Kanchan Chauhan
253c6f962d fix: Subject of Stock Entry feed 2019-04-23 14:40:02 +05:30
Nabin Hait
64bfdd9596 fix: test cases 2019-04-23 13:37:19 +05:30
Nabin Hait
593242fa5c fix: Calculate rate based on discount on server side only if not rate or pricing rule applied 2019-04-23 13:22:38 +05:30
Nabin Hait
319c912f91 fix: Load doc before save 2019-04-23 13:13:36 +05:30
Rushabh Mehta
77b82894ff fix(style): buttons in address and contact 2019-04-23 07:57:31 +05:30
Suraj Shetty
df59c1573d feat: Add training date field 2019-04-22 23:35:36 +05:30
deepeshgarg007
e3ea806390 fix: Ignore sql injections 2019-04-22 21:08:29 +05:30
deepeshgarg007
d5e7bf8f0f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items 2019-04-22 21:07:27 +05:30
deepeshgarg007
4f57328924 Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po 2019-04-22 20:25:41 +05:30
deepeshgarg007
555f425da1 fix: Test case and styling fixes 2019-04-22 20:24:31 +05:30
Deepesh Garg
2ef7022385 fix: Remove print statements (#17333) 2019-04-22 19:25:18 +05:30
scmmishra
936f36ccda fix: import frappe._ in lms.py 2019-04-22 18:55:19 +05:30
scmmishra
68b3203366 chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment 2019-04-22 18:50:08 +05:30
scmmishra
3673b25b64 fix: quiz is now visible to administrator 2019-04-22 18:10:19 +05:30
deepeshgarg007
d249325d98 Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po 2019-04-22 18:00:13 +05:30
deepeshgarg007
a89d1df655 fix: Typo fixes 2019-04-22 17:54:38 +05:30
scmmishra
804a74c01c fix (ui): UI fixes to Video page 2019-04-22 17:52:48 +05:30
scmmishra
6c8f23b27e fixed (ui): Fixed cards with better buttons 2019-04-22 17:51:30 +05:30
Nabin Hait
7f4e7b63d7 fix: Income tax period factor considering joining and relieving date 2019-04-22 17:39:36 +05:30
deepeshgarg007
bf2adae97d fix: Ordering and datatype fixes in inactive items report 2019-04-22 17:15:23 +05:30
deepeshgarg007
8a5d556f53 Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items 2019-04-22 16:59:33 +05:30
deepeshgarg007
425699d9f2 fix: Material request list_view status fixes 2019-04-22 16:54:52 +05:30
Nabin Hait
af309473f8 Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop
fix: moved erpnext related methods from frappe to erpnext(cherry-picked)
2019-04-22 15:59:30 +05:30
Nabin Hait
8624957cbc Merge pull request #17291 from prasadarr/listing-fixes
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Nabin Hait
28a7aec124 Update accounting.py 2019-04-22 15:35:13 +05:30
deepeshgarg007
6f57b05fed Merge branch 'develop' of https://github.com/frappe/erpnext into notification 2019-04-22 15:26:55 +05:30
Rushabh Mehta
3bf71cc18e fix(splash): revert to old image 2019-04-22 15:24:28 +05:30
Deepesh Garg
15a7b7ce71 fix: GSTR 3b report fixes (#17317)
* fix: GSTR-3b report total taxable value fixes

* fix: Test Cases
2019-04-22 15:22:36 +05:30
Nabin Hait
0828064596 Merge pull request #17323 from nabinhait/rename-depends-on-lwp
fix: Renamed depends_on_lwp to depends_on_payment_days
2019-04-22 14:55:56 +05:30
scmmishra
5079e6c1c1 chore: minor improvements 2019-04-22 14:48:32 +05:30
scmmishra
ac8d3479c9 feat: Added add_quiz_activity function to course_enrollment class 2019-04-22 14:38:51 +05:30
scmmishra
33969b7d7c chore: Minor change to question doctype 2019-04-22 14:30:14 +05:30
Rohit Waghchaure
270d4e9f4e fix: moved erpnext related methods from frappe to erpnext 2019-04-22 14:11:43 +05:30
scmmishra
66d239281c chore: minor code improvements 2019-04-22 14:10:09 +05:30
Nabin Hait
d3cd98c45e fix: Renamed depends_on_lwp to depends_on_payment_days 2019-04-22 13:45:45 +05:30
Nabin Hait
452f2c5694 Merge pull request #17322 from nabinhait/salary-structure-child-docstatus
Salary structure child docstatus
2019-04-22 13:42:55 +05:30
Nabin Hait
36561801c2 Update set_salary_details_submitable.py 2019-04-22 13:38:06 +05:30
Anurag Mishra
35e52b5596 fix: fixed spelling 2019-04-22 13:37:03 +05:30
Nabin Hait
0294a7f0fd Merge pull request #17318 from SaiFi0102/Revert-Allocate-Advance-Automatically-V12
fix: Set Allocate Advance Automatically disabled by default (v12)
2019-04-22 13:32:37 +05:30
Saif Ur Rehman
a216844d2c fix: Set Allocate Advance Automatically disabled by default 2019-04-22 12:10:40 +05:00
scmmishra
64d2fe0ad7 fix: Minor typo 2019-04-22 12:30:08 +05:30
scmmishra
4add826703 chore: Minor code improvements
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
2019-04-22 12:28:13 +05:30
deepeshgarg007
06c20400ee feat: Track purchase receipt status in Material Request 2019-04-22 12:25:14 +05:30
scmmishra
da2c90cd18 chore: renamed get_program api functions
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
2019-04-22 12:21:40 +05:30
scmmishra
9967d27b9a chore: renamed ambiguous variable names in lms.py 2019-04-22 12:08:41 +05:30
Faris Ansari
733ff48d51 fix: Refactor for Print Format changes (#17242)
- Rename Server to Jinja
- Rename Js to JS
2019-04-22 12:08:18 +05:30
scmmishra
d78c326f95 chore: renamed get_topic_meta to get_student_topic_details 2019-04-22 12:06:28 +05:30
scmmishra
d5973fe4bc chore: renamed get_course_meta to get_student_course_details 2019-04-22 12:05:22 +05:30
scmmishra
327334a830 chore: refactor utils.get_current_student 2019-04-22 12:03:17 +05:30
scmmishra
823d89cf66 fix (linting): codacy fixes 2019-04-22 11:46:22 +05:30
Nabin Hait
89d3aaf349 Merge pull request #17310 from nabinhait/ar-fix-develop
fix: Total row alignment in AR report
2019-04-22 11:11:38 +05:30
Suraj Shetty
2a9b17efd4 Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map 2019-04-21 23:53:54 +05:30
Suraj Shetty
079684f7da feat: Task type (#17311)
* feat: Add task type doctype
2019-04-20 23:37:49 +05:30
Nabin Hait
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +05:30
Nabin Hait
65b3a849d3 Merge pull request #17306 from surajshetty3416/fix-employee-permission
fix: Do not create employee user permission if already exists
2019-04-20 01:44:06 +05:30
Nabin Hait
ee43f9d154 Merge pull request #17305 from nabinhait/inv-disc-fix1
fix: fetch party account as discounted receivable account in payment entry
2019-04-20 01:40:55 +05:30
Nabin Hait
d8783343f3 Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)
2019-04-20 01:27:31 +05:30
Suraj Shetty
98390dae49 fix: Do not create employee user permission if already exists 2019-04-19 21:52:08 +05:30
Nabin Hait
c8b1351e87 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07 fix: fetch party account as discounted receivable account in payment entry 2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850 Merge pull request #17299 from nabinhait/inv-disc-fixes
fix: Close loan considering latest invoice outstanding balance
2019-04-19 21:27:02 +05:30
Nabin Hait
a6e09826b3 Merge pull request #17297 from netchampfaris/index-item-route
fix: Add index to Item route
2019-04-19 20:11:29 +05:30
Nabin Hait
375f051b24 Merge pull request #17277 from nabinhait/invoice-discounting-fixes
Invoice discounting fixes
2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd fix: Close loan considering latest inv outstanding balance 2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7 fix: test cases 2019-04-19 15:10:02 +05:30
Rohit Waghchaure
72cc7508b0 fix: Requested Items To Be Ordered report showing records even if material request is fully ordered 2019-04-19 14:57:38 +05:30
Faris Ansari
1d78aae2af fix: Add index to Item route
Increases route resolve time if there are lots of Items.
2019-04-19 14:03:25 +05:30
Nabin Hait
0aa036cda5 Merge pull request #17294 from scmmishra/trial-detail-fix
fix: fixed trial details
2019-04-19 13:18:03 +05:30
Nabin Hait
48e1e04df2 Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop
fix: task name was not able to search by name in global search (Cherry-picked)
2019-04-19 13:06:42 +05:30
Nabin Hait
05651291b2 Merge pull request #17281 from rohitwaghchaure/credit_will_not_be_converted_if_debit_amount_is_there_develop
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger(Cherry-picked)
2019-04-19 13:00:29 +05:30
Prasad R
198c7ae73d fix: show 2 missing doctypes in Accounts 2019-04-19 12:43:58 +05:30
scmmishra
a55d32236a fix: fixed trial details 2019-04-19 12:22:30 +05:30
Prasad R
e1a6022c8c fix: Allow system manager to access share ledger 2019-04-19 10:57:21 +05:30
Rohit Waghchaure
94f43ca2e2 fix: task name was not able to search by name in global search 2019-04-18 22:39:42 +05:30
Rohit Waghchaure
376db4f6b7 fix: credit amount in account's currency not be consider if debit amount is present in the general ledger 2019-04-18 22:06:22 +05:30
deepeshgarg007
c841bd486a feat: Added validations and mapper to create inter company mapper 2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af feat: Added custom button to make inter company order 2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd feat: Updated doctypes for sales and purchase order 2019-04-18 20:08:20 +05:30
Nabin Hait
c99c712913 fix: Validate and update invoice discounting status on JE submit/cancel 2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf fix: Don't fetch already discounted invoice 2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2 fix: Added invoice discounting dashboard 2019-04-18 14:47:44 +05:30
Suraj Shetty
3aa5e125bd feat: Add employee training section to the employee skill map 2019-04-18 12:46:33 +05:30
deepeshgarg007
767a00fa8d feat: Logic for query and report creation for inactive items 2019-04-18 08:45:10 +05:30
deepeshgarg007
4d1df416e9 fix: Reordered and deleted unnecessary filters 2019-04-18 08:29:21 +05:30
Nabin Hait
0050652be9 Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop
fix: GSTR-1 B2C Small report fix
2019-04-17 17:32:29 +05:30
Nabin Hait
3a2d6a4043 Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Nabin Hait
26dd192516 Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop
fix: If finance book filter is not set then show all the entries(Cherry-pick)
2019-04-17 17:22:45 +05:30
Shivam Mishra
f3cc87455a Merge pull request #17249 from scmmishra/auto-fetch-serial
feat: Auto fetch serial numbers
2019-04-17 17:15:27 +05:30
Rohit Waghchaure
38238b0cfd fixed test cases 2019-04-17 15:56:00 +05:30
scmmishra
fed4fd0f02 style: linting issue fixed 2019-04-17 15:46:15 +05:30
Shivam Mishra
63921ebbc9 style: fixed formatting
Fixed formatting for for auto_fetch_serial_number
2019-04-17 15:29:29 +05:30
deepeshgarg007
cab2d82ea8 Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items 2019-04-17 11:35:56 +05:30
scmmishra
5522cf8c26 fix: codacy linting 2019-04-17 10:26:21 +05:30
Faris Ansari
1cf9fa9662 fix: Refactor Upload Attendance (#17241)
New API frappe.ui.FileUploader
https://github.com/frappe/frappe/pull/7253
2019-04-17 09:45:46 +05:30
deepeshgarg007
9f873e97fa fix: Remove print statement 2019-04-16 20:58:22 +05:30
deepeshgarg007
c354a17383 fix: Code cleanup 2019-04-16 20:56:49 +05:30
deepeshgarg007
e5a869bc45 fix: GSTR-1 B2CS report fix 2019-04-16 20:08:12 +05:30
Rohit Waghchaure
7aee809571 fix: If finance book filter is not set then show all the entries 2019-04-16 19:35:18 +05:30
rohitwaghchaure
1ddc123dbf Merge pull request #17261 from rohitwaghchaure/pos_not_working_if_user_can_access_more_than_one_company_develop
fix: POS not working if user has access of multiple company(Cherry-pick)
2019-04-16 18:44:27 +05:30
Rohit Waghchaure
00d73cda50 fix: POS not working if user has access of multiple company 2019-04-16 18:43:16 +05:30
rohitwaghchaure
f950275a58 Merge pull request #17260 from rohitwaghchaure/fix_pending_so_items_for_purchase_request_report_develop
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items(Cherry-pick)
2019-04-16 18:26:55 +05:30
Rohit Waghchaure
34ee41a35e fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items 2019-04-16 18:26:11 +05:30
scmmishra
6d3302b0cc style (codacy): code formatting fixes 2019-04-16 18:25:53 +05:30
deepeshgarg007
508e815db0 feat: Added filters and columns for inactive items report 2019-04-16 17:07:13 +05:30
scmmishra
ed4b052df8 style (codacy): code formatting fixes 2019-04-16 17:03:25 +05:30
scmmishra
46901076be feat: Use standard serial picker to add as well as update serial numbers 2019-04-16 17:01:01 +05:30
scmmishra
c791c3b24b fix: Minor bug in serial no auto fetch api 2019-04-16 16:07:32 +05:30
scmmishra
eee5c38911 feat: Use controller for serial no. API 2019-04-16 15:57:51 +05:30
scmmishra
61d6b677e4 feat: Show standard serial number selector in item grid form 2019-04-16 15:17:27 +05:30
Rushabh Mehta
59c5a16037 fix(account_balance_timeline): remove unused import 2019-04-16 15:11:45 +05:30
scmmishra
407496b528 chore: minor changes to labels 2019-04-16 13:32:41 +05:30
Nabin Hait
0c896c38f8 Merge pull request #17244 from hrwX/delivery_note_fix_v12
fix(Delivery Note): show get items even if note has been amended
2019-04-16 13:20:26 +05:30
Himanshu
ef848fda2a fix: let user delete the elements of items 2019-04-16 13:17:20 +05:30
Nabin Hait
00e9659e3f Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-16 12:51:13 +05:30
scmmishra
19a41ed16d chore: code cleaning 2019-04-16 12:51:05 +05:30
scmmishra
41cf945247 feat (UX): Refactored batch selector 2019-04-16 12:47:39 +05:30
Nabin Hait
d2044c0f23 Merge pull request #17184 from frappe/akurungadam-patch-1
fix: misleading condition example in field options
2019-04-16 12:44:17 +05:30
scmmishra
8ec54c2214 feat: Added auto fetch serial numbers API 2019-04-16 12:20:55 +05:30
scmmishra
b98612ff5b feat: Added auto fetch logic and button for client 2019-04-16 12:20:42 +05:30
Himanshu Warekar
810dde2e0b fix: show get items even if note has been amended 2019-04-16 12:20:35 +05:30
Suraj Shetty
006c3dccf9 feat: Add logic to auto fetch skill from designation doc
- Set today as default evaluation date
2019-04-16 12:14:44 +05:30
Nabin Hait
b5199951ad Merge pull request #17239 from nabinhait/pr-pi
fix: Invoice against partially returned DN/PR
2019-04-16 11:54:12 +05:30
Rushabh Mehta
1c2eb51a91 fix(api) 2019-04-16 11:12:34 +05:30
Suraj Shetty
354c70a0e7 feat: Init employee skill map doctype 2019-04-16 10:20:32 +05:30
Suraj Shetty
a0f7656ffc feat: Add skill child table to designation doctype
- To record skills required of a particular designation
2019-04-16 10:19:53 +05:30
Nabin Hait
29997e2631 fix: Invoice against partially returned DN/PR 2019-04-16 09:55:42 +05:30
Nabin Hait
c066bbde06 Merge pull request #17235 from hrwX/remove_asset_permission_v12
fix(Asset): Remove user permission for employee in asset
2019-04-16 09:45:40 +05:30
Rushabh Mehta
6dff8038e6 fix(account_balance_timeline) 2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d fix(account_balance_timeline) 2019-04-16 09:33:21 +05:30
Faris Ansari
557520148e fix: Item Variant Attribute Order (#17237)
- Show Item Variant Attributes in order they appear in child table
2019-04-15 23:19:44 +05:30
Himanshu Warekar
9b7c7787e6 Merge develop 2019-04-15 22:56:41 +05:30
Himanshu Warekar
3e503f213b fix: remove user permission for emp in asset 2019-04-15 22:50:22 +05:30
Nabin Hait
a5265113ce Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix
fix(woocommerce integration): 403 error and adding defaults
2019-04-15 21:17:16 +05:30
Nabin Hait
e9d9576cd7 Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting
Invoice Discounting
2019-04-15 21:14:19 +05:30
karthikeyan5
605a0a0570 fix(woocommerce integration): travis fix
(cherry picked from commit 2518a2ab16)
2019-04-15 19:47:13 +05:30
karthikeyan5
13563dc495 fix(woocommerce integration): fix strange travis error
the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings'

(cherry picked from commit df3e8853ae)
2019-04-15 19:47:13 +05:30
karthikeyan5
63f8cda069 fix(woocommerce integration): possible travis fix
possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)"

(cherry picked from commit a0b7ff60b8)
2019-04-15 19:47:13 +05:30
karthikeyan5
69f0ce178e fix(woocommerce integration): error in new-site
resolving "Could not find UOM: Nos" error in travis

(cherry picked from commit 97383716e6)
2019-04-15 19:47:13 +05:30
karthikeyan5
307e6a8825 fix(woocommerce integration): defaults in settings
(cherry picked from commit f788117b3e)
2019-04-15 19:47:02 +05:30
karthikeyan5
2b0a8de74f fix(woocommerce integration): fixing 403 error
(cherry picked from commit 6784335e2c)
2019-04-15 19:45:38 +05:30
Nabin Hait
076cc38c29 fix: Outstanding amount on making payment against discounted invoice 2019-04-15 18:42:10 +05:30
Rushabh Mehta
6aaac1e9db fix(assign): do not assign if administrator 2019-04-15 16:58:45 +05:30
Rushabh Mehta
44b0cb6383 Merge pull request #17194 from rmehta/dashboard-refactor
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43 Fixed merge conflict 2019-04-15 16:16:25 +05:30
Nabin Hait
fa8f13dc98 Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
fix: POS takes lot of time to load the items data
2019-04-15 10:11:31 +05:30
Nabin Hait
6ecc83aaf0 Merge pull request #17182 from hrwX/revert_salary_slip
Revert(Salary Slip): Wrong Formula
2019-04-15 10:08:53 +05:30
Nabin Hait
e7e2e93419 Merge pull request #17183 from netchampfaris/duplicate-variant-check-d
fix: Validate variant attributes only if is_new
2019-04-15 10:08:28 +05:30
Nabin Hait
8ab393448f Merge pull request #17218 from netchampfaris/item-price-packing-unit-d
fix: Set default value for Packing Unit as 0
2019-04-15 10:06:45 +05:30
Nabin Hait
9fd3f10b67 Merge pull request #17220 from Anurag810/payment-entry-fix
fix: handle for party type member in payment entry (v12)
2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8 Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
feat: Added bank account no in bank reconcilliation
2019-04-14 16:10:19 +05:30
scmmishra
5b9df676a4 fix: minor bug in breadcrumb routing 2019-04-13 18:53:49 +05:30
Deepesh Garg
1b0edbc8b3 fix: GSTR3b 3b template fix (#17224) 2019-04-13 18:37:08 +05:30
Anurag Mishra
95714297a4 fix: handle for party type member in payment entry 2019-04-12 15:03:46 +05:30
Suraj Shetty
c90364f94d feat: Add task weight for employee onboarding activity (#17216)
This activity weight will be used to update the task weight
2019-04-12 14:12:03 +05:30
Faris Ansari
581e5fbfda fix: Set default value for Packing Unit as 0
The default value 1 assumes Items will be always packed in integer
quantities. This is not the usual case.
2019-04-12 12:39:12 +05:30
Rushabh Mehta
54ba900e72 Merge pull request #17214 from rmehta/auto-assign-issue
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 11:11:59 +05:30
Nabin Hait
851acc30b3 Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue
fix: Fixed Sanctioned Amount Update Issue in Expense Claim
2019-04-12 11:06:02 +05:30
Nabin Hait
165e92ad5b Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-12 11:02:37 +05:30
Rushabh Mehta
4f49ce4124 feat: auto assign lead/opportunity to lead owner, customer account manager 2019-04-12 09:04:17 +05:30
Rohit Waghchaure
2454d89068 Optimized the code to fix slow loading of items in the POS 2019-04-11 19:52:00 +05:30
Faris Ansari
0ff5a7b30f Merge pull request #16827 from Mangesh-Khairnar/so-on-hold
Feature: Sales order on hold
2019-04-11 19:29:48 +05:30
Rohit Waghchaure
72cc37e8da fix: Taxes and charges table not clear the existing rows if the template is changed 2019-04-11 18:35:15 +05:30
scmmishra
ff970a8062 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-04-11 18:32:19 +05:30
Basawaraj Savalagi
9ce8c3061f Fixed Sanctioned Amount Update Issue in Expense Claim 2019-04-11 16:30:11 +05:30
Rushabh Mehta
d625c32ab1 fix(dashboard): for frappe updates, and a new splash logo 2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088 Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
Feature: Purchase order on hold
2019-04-11 15:36:54 +05:30
Nabin Hait
65cca62ef9 fixed merge conflict 2019-04-11 12:32:43 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
rohitwaghchaure
92b190febb Merge pull request #17199 from Anurag810/pos_running_items
fix: item order by idx in pos(v12)
2019-04-11 11:53:22 +05:30
Nabin Hait
0f62b13dd8 Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items
fix: sales return not working for product bundle items
2019-04-11 11:44:57 +05:30
Nabin Hait
961d7ace4a Merge pull request #17189 from nabinhait/sales-person
fix: Made employee optional in sales person
2019-04-11 11:37:08 +05:30
Nabin Hait
38351587fc Merge pull request #17197 from nabinhait/training-feedback
fix: training feedback code cleanup
2019-04-11 11:36:50 +05:30
Anurag Mishra
4c29d80cf1 fix: minor fixes 2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3 fix: start date and loan period should be mandatory 2019-04-11 11:08:07 +05:30
rohitwaghchaure
4898d1936b Merge pull request #17200 from Anurag810/pos_running
fix: order by idx(v11)
2019-04-11 10:57:05 +05:30
rohitwaghchaure
a6f54aa437 Merge pull request #17204 from rohitwaghchaure/fix_test_cases_for_item_variant_develop
fix: item variant test cases(cherry-pick)
2019-04-11 10:56:06 +05:30
rohitwaghchaure
22d6eb3eaa Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
2019-04-11 09:58:02 +05:30
rohitwaghchaure
6cd114b467 Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Rohit Waghchaure
9665a531fc fix: item variant test cases 2019-04-11 09:56:00 +05:30
scmmishra
5214c5cdb3 fix: Minor fix to test program 2019-04-10 20:37:45 +05:30
scmmishra
8c89083647 fix: test fixes for program doctype 2019-04-10 20:02:39 +05:30
rohitwaghchaure
2521b1347b Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant
Fix: item variant test cases
2019-04-10 19:16:51 +05:30
scmmishra
7a1c649dbd fix: Test fixes 2019-04-10 19:02:06 +05:30
Anurag Mishra
9a2ae67f86 fix: order by idx 2019-04-10 17:57:23 +05:30
Rohit Waghchaure
f3a9552e48 fix: item variant test cases 2019-04-10 17:57:09 +05:30
Anurag Mishra
5ab5f77fd4 fix: order by idx 2019-04-10 17:53:45 +05:30
scmmishra
d2917a8c38 feat: Fixed test data for student doctype 2019-04-10 17:50:26 +05:30
Rohit Waghchaure
49907e746b fix: test cases 2019-04-10 17:33:32 +05:30
Rohit Waghchaure
45d0b31d44 fix: test cases 2019-04-10 17:25:08 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Nabin Hait
c8c678f747 fix: training feedback code cleanup 2019-04-10 15:56:16 +05:30
Basawaraj Savalagi
05458b7fc6 Fixed Company Abbr Update Was Not Able To Update Account 2019-04-10 13:33:43 +05:30
Rohit Waghchaure
bb0d4e37b9 fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method 2019-04-10 03:14:11 +05:30
Nabin Hait
b305f38869 fix: Made employee optional in sales person 2019-04-09 20:06:11 +05:30
Rohit Waghchaure
30fda3ee54 feat: Added bank account no in bank reconcilliation 2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4 fix(dashboard): as per new features 2019-04-09 18:38:03 +05:30
Anoop
cb278975f3 fix: misleading condition example in field options
condition example corrected -

gender=\"Male\"
to 
gender==\"Male\"
2019-04-09 18:10:41 +05:30
Mangesh-Khairnar
63cf56f406 style: change function call to anonymous function call 2019-04-09 17:47:25 +05:30
Faris Ansari
4da3d0015a fix: Validate variant attributes only if is_new 2019-04-09 17:40:53 +05:30
Nabin Hait
7dcdb93596 Merge pull request #17178 from Anurag810/timesheet_report_fixes
fix: timesheet_report (WN-SUP41913)
2019-04-09 17:28:22 +05:30
Himanshu Warekar
5632dbdd18 revert: wrong formula 2019-04-09 16:53:54 +05:30
Rohit Waghchaure
0e9cd2e00a feat: Production plan enhancements 2019-04-09 16:53:38 +05:30
rohitwaghchaure
5f2238e98f Merge pull request #17181 from Anurag810/fix_auditing_voucher
fix: Auditing voucher
2019-04-09 16:36:03 +05:30
Nabin Hait
1245139c51 Merge branch 'develop' into invoice-d 2019-04-09 15:27:13 +05:30
Anurag Mishra
67e6da2086 fix: Removed Extra page on generating pdf in print formats 2019-04-09 15:19:05 +05:30
Anurag Mishra
ef11d378d4 fix: UI on generating pdf in print format 2019-04-09 15:19:05 +05:30
Anurag Mishra
ed82e8ba3b fix: removed before from accounts_controlle.pyr and fetch the gl from frontend 2019-04-09 15:19:05 +05:30
Anurag Mishra
b62cfffdea fix: Print Auditing print format 2019-04-09 15:19:05 +05:30
Anurag Mishra
22867f7fa5 fix: added currency 2019-04-09 15:06:49 +05:30
Anurag Mishra
3e8b8a4359 fix: filters and some conditions 2019-04-09 14:34:56 +05:30
scmmishra
acc0fa3b00 fix: Added desciption in program test record 2019-04-09 13:20:11 +05:30
scmmishra
bae2d669b5 fix: codacy linting issues 2019-04-09 12:57:56 +05:30
scmmishra
abb35ad308 fix: Possible fix for failing tests 2019-04-09 12:38:42 +05:30
Mangesh-Khairnar
b70b048fa2 style: change type comparison for boolean expression 2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-04-09 12:13:45 +05:30
Mangesh-Khairnar
a2facd4dd2 style: change function call to anonymous function 2019-04-09 12:07:44 +05:30
scmmishra
b7d9efe901 Merged develop in lms 2019-04-09 11:39:12 +05:30
Rushabh Mehta
0d3986c9f6 fix(dashboard): account timeline for balance sheet accounts 2019-04-09 11:36:41 +05:30
scmmishra
dd889f8796 fix: Fixed hero image field in COurse and Topic 2019-04-09 11:36:31 +05:30
Anurag Mishra
17fbafa390 fix: filters,added total,only submitted doc,considered fraction 2019-04-09 11:31:11 +05:30
Faris Ansari
aac7719dd9 fix: Translated string method in Jinja (#17174) 2019-04-08 21:50:58 +05:30
scmmishra
88f0c464b4 feat: Added breadcrumbs 2019-04-08 19:56:21 +05:30
Rushabh Mehta
da3f07221c fix(dashboard): accounting timeline query fix 2019-04-08 19:38:55 +05:30
Rushabh Mehta
3882a41c51 fix(dashboard): simpler way to get account timeline from first principles 2019-04-08 19:05:12 +05:30
Rushabh Mehta
2cce72412d Merge pull request #17168 from frappe/revert-17086-check-version-hf
Revert "fix: Raise exception if apps are on incompatible branches"
2019-04-08 17:11:15 +05:30
Rushabh Mehta
1412a681f3 Revert "fix: Raise exception if apps are on incompatible branches" 2019-04-08 17:10:56 +05:30
Rushabh Mehta
fbc56c6d97 fix(style): left padding in marketplace view 2019-04-08 17:02:22 +05:30
Mangesh-Khairnar
1934a76cd8 feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107)
* enhancement: add status field in ordered itemd to be delivered

* enhancement: add status field in purchase order itemd to be received

* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
Saurabh
b0c939d280 Merge branch 'hotfix' 2019-04-08 15:09:04 +05:30
Saurabh
00a5e7a1d0 bumped to version 11.1.20 2019-04-08 15:39:03 +06:00
Nabin Hait
f1698bb2df fix: unique variant based on 2019-04-08 14:59:43 +05:30
Nabin Hait
79c9d5d24a Merge pull request #17146 from Anurag810/timesheet-report
feat: Timesheet report
2019-04-08 10:33:44 +05:30
Rohit Waghchaure
3771db92b8 fix: sales return not working for bundle items 2019-04-06 17:34:40 +05:30
rohitwaghchaure
bc02ee23e0 Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17 Added test cases 2019-04-06 12:29:05 +05:30
Saurabh
c32f8eb0cb Merge branch 'hotfix' 2019-04-05 16:59:22 +05:30
Saurabh
63fabc3723 bumped to version 11.1.19 2019-04-05 17:29:22 +06:00
Nabin Hait
398e4b9472 fix: Ignore item tax patch if old schema does not exists 2019-04-05 16:41:17 +05:30
Nabin Hait
e6ee43b102 Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj
feat: add date of joining column in salary register
2019-04-05 16:02:48 +05:30
Nabin Hait
374b85b38e Merge pull request #17140 from hrwX/pe_supp_inv_v12
fix(Payment Entry): Return Bill No on for Payment Entry
2019-04-05 15:59:58 +05:30
Nabin Hait
d70476fbc8 Merge pull request #17139 from hrwX/pe_supp_inv_v11
fix(Payment Entry): Return Bill No for Payment Entry
2019-04-05 15:59:43 +05:30
Nabin Hait
8cf76e74e0 Merge pull request #17133 from hrwX/validate_stock_transaction_v11
fix(Item): check transactions for batch, serial check
2019-04-05 15:41:35 +05:30
Nabin Hait
843e440191 Merge branch 'hotfix' into validate_stock_transaction_v11 2019-04-05 15:41:26 +05:30
Nabin Hait
9302a19d74 Merge pull request #17135 from hrwX/validate_stock_transaction_v12
fix(Item): check transactions for batch, serial check
2019-04-05 15:40:19 +05:30
Nabin Hait
1580e24946 Merge pull request #17137 from netchampfaris/item-group-clean-description
fix(Item Group): Don't clean description html
2019-04-05 15:39:44 +05:30
Nabin Hait
603dce428b Merge pull request #17144 from nabinhait/variant-fix
fix: Default variant Based on
2019-04-05 15:38:15 +05:30
Anurag Mishra
0dc62e8747 fix: Removed raw query and used frappe.get_all 2019-04-05 14:36:43 +05:30
Anurag Mishra
f71c147ea8 Added mandatory feilds to the report 2019-04-05 14:36:43 +05:30
Anurag Mishra
5c17e7760b fix: readability 2019-04-05 14:36:43 +05:30
Anurag Mishra
b57c024ff7 feat: Project Billing Summary for timesheet 2019-04-05 14:36:43 +05:30
Anurag Mishra
61aab377b6 Minor Fixes 2019-04-05 14:36:42 +05:30
Anurag Mishra
3d27aabdeb Commonify code 2019-04-05 14:36:42 +05:30
Anurag Mishra
94514ffee9 feat: timesheet Employee Summary Report 2019-04-05 14:36:42 +05:30
Mangesh-Khairnar
3c251663bb style: add type comparison for boolean expression 2019-04-05 14:10:05 +05:30
rohitwaghchaure
e334413b34 Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if
fix: incorrect auto POS profile selected in the sales invoice
2019-04-05 13:04:05 +05:30
Mangesh-Khairnar
e7d53540de feat: add doj column in salary register 2019-04-05 12:56:11 +05:30
Mangesh-Khairnar
3d667b4c94 Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold 2019-04-05 12:11:26 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
John Clarke
b733984ca1 fix: Remove duplicate Timesheet item (#17066) 2019-04-05 11:02:25 +05:30
rohitwaghchaure
fc471ed63b Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
fix: incorrect POS profile selected
2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a always set the company from the POS Profile 2019-04-05 09:58:04 +05:30
Rohit Waghchaure
e8e3fb175d fix: incorrect POS profile selected 2019-04-05 09:57:52 +05:30
Rohit Waghchaure
4324f43a06 always set the company from the POS Profile 2019-04-05 09:54:55 +05:30
rohitwaghchaure
cbdd3304a4 Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos
fix: POS search items not works properly if item group filter has applied
2019-04-05 00:45:53 +05:30
Rohit Waghchaure
f7a83cb4f5 fix: incorrect POS profile selected 2019-04-05 00:42:48 +05:30
cjpit
0c87895afc fix(node_modules): remove hardcoded symlink (#16975)
* add node_modules directory to gitignore

* remove node_modules symlink
2019-04-05 00:12:26 +05:30
Himanshu Warekar
b30f584410 fix: return bill_no 2019-04-04 19:55:13 +05:30
Himanshu Warekar
6443d7dd10 refactor: declare bill_on at function start 2019-04-04 19:54:23 +05:30
Himanshu Warekar
ad32324c4c fix: get bill_no 2019-04-04 19:50:23 +05:30
Rohit Waghchaure
0a4aee0206 fix: POS search items not works properly if item group filter has applied 2019-04-04 16:02:15 +05:30
Faris Ansari
7a0a05d8f1 fix(Item Group): Don't clean description html 2019-04-04 15:53:16 +05:30
rohitwaghchaure
0a57ef4bea Merge pull request #17134 from rohitwaghchaure/not_able_to_change_pos_profile
fix: not able to change pos profile
2019-04-04 15:42:28 +05:30
Himanshu Warekar
cdd79e3c40 fix: check transactions for batch, serial check 2019-04-04 15:26:35 +05:30
Rohit Waghchaure
55d3bcac37 fix: not able to change pos profile 2019-04-04 15:26:00 +05:30
Himanshu Warekar
7f253b679a pull from hotfix 2019-04-04 15:19:44 +05:30
Himanshu Warekar
28db545947 fix: check transactions for batch, serial check 2019-04-04 15:02:25 +05:30
Nabin Hait
82bd388993 Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes
fix: Removed Location from Abbreviation Update DocTypes
2019-04-04 11:50:33 +05:30
Nabin Hait
9087efa5be Merge pull request #17131 from Anurag810/desk-fixes
fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).
2019-04-04 11:49:56 +05:30
Nabin Hait
b861c4bc46 Merge pull request #16895 from Alchez/hotfix-shipping-charge-override
fix(transaction): Fix shipping rule charge override by tax template
2019-04-04 11:48:48 +05:30
Nabin Hait
e0a9835f30 Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix
fix(Party Ledger Summary): Show all adjustment entries as columns
2019-04-04 11:45:36 +05:30
Nabin Hait
0747273ea4 Merge pull request #17028 from sagarvora/field_order
fix(accounts): dependent field should be displayed after source link field
2019-04-04 11:45:01 +05:30
Nabin Hait
94c822f5f0 Merge pull request #17022 from hrwX/cost_center_fix
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:44 +05:30
Nabin Hait
9eeb3715f0 Merge pull request #16992 from hrwX/cost_center
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:35 +05:30
Nabin Hait
2df623c693 Merge pull request #17072 from kennethsequeira/auto-re-val
fix: spelling in validation message for Auto-reorder
2019-04-04 11:40:08 +05:30
Nabin Hait
1e5664ba5f Update item.py 2019-04-04 11:39:55 +05:30
Nabin Hait
f4ae29320f Merge pull request #17087 from deepeshgarg007/payment_entry
Party type validation in payment entry
2019-04-04 11:39:00 +05:30
Anurag Mishra
76795aa086 fix: desk for selling module sales invoice now avaialble at module page 2019-04-04 11:38:42 +05:30
Nabin Hait
a8c7e39a71 Merge pull request #17128 from hrwX/typo_fix_v12
fix(Issue): typo fix for Status
2019-04-04 11:24:16 +05:30
Nabin Hait
f86a01446f Merge pull request #17086 from adityahase/check-version-hf
fix: Raise exception if apps are on incompatible branches
2019-04-04 11:17:04 +05:30
Nabin Hait
9ee417888e Merge pull request #17092 from nabinhait/ar-ap-print
fix: Show Sales Person in AR/AP print is optional
2019-04-04 11:02:26 +05:30
Nabin Hait
2c869bd486 Merge pull request #17101 from hrwX/india_setup
fix(India): Add HSN/SAC in setup
2019-04-04 11:02:11 +05:30
Himanshu Warekar
5ccc4731d0 fix: typo fix 2019-04-04 11:02:05 +05:30
Himanshu
c930cb10fa fix: remove duplicate doctype 2019-04-04 11:01:10 +05:30
Nabin Hait
91b1875ccf Merge pull request #17099 from nabinhait/return-precision-issue
fix: Validate returned qty with ref qty considering field precision
2019-04-04 10:59:26 +05:30
Nabin Hait
2092a8b1cf Merge pull request #17100 from nabinhait/gl-entry-precision
fix: Validate gl entry debit/credit as per field's precision
2019-04-04 10:59:06 +05:30
Nabin Hait
6ffdddc100 Merge pull request #17126 from rmehta/warehouse-account-description
fix(kaizen): warehouse account description
2019-04-04 10:50:52 +05:30
Nabin Hait
fdf52a82d6 Merge pull request #17127 from rmehta/warehouse-account-fix-develop
fix(kaizen): warehouse account description
2019-04-04 10:50:42 +05:30
Nabin Hait
3149596b53 Merge pull request #17102 from hrwX/hsn_india_v12
fix(India): HSN Code
2019-04-04 10:49:55 +05:30
Nabin Hait
b652421a54 Merge pull request #17106 from nabinhait/loan-link
fix: Added link for loan in HR module page
2019-04-04 10:49:37 +05:30
Nabin Hait
d2c370a215 Merge pull request #17113 from deepeshgarg007/item-register
fix: Divide by zero exception handling
2019-04-04 10:49:13 +05:30
Rushabh Mehta
3720e64506 fix(kaizen): warehouse account description 2019-04-04 09:02:41 +05:30
Rushabh Mehta
1f0edabda8 fix(kaizen): warehouse account description 2019-04-04 08:58:34 +05:30
Rushabh Mehta
e7b6b46309 Merge pull request #17109 from PawanMeh/fixes_16894_v11
fix: Amazon v11 integration issues
2019-04-03 22:54:43 +05:30
asbasawaraj
d2b69445b1 Removed Location from Abbreviation Update DocTypes 2019-04-03 17:05:53 +05:30
rohitwaghchaure
fb48686d82 Merge pull request #17118 from rohitwaghchaure/_incorrect_prezzototale
fix: incorrect PrezzoTotale
2019-04-03 16:33:56 +05:30
Rohit Waghchaure
a2f71cdeec fix: incorrect PrezzoTotale 2019-04-03 16:10:14 +05:30
Nabin Hait
b1f3f04d71 fix: Validate gl entry debit/credit as per field's precision 2019-04-03 12:30:25 +05:30
deepeshgarg007
5ad7b655cf fix: Divide by zero exception handling 2019-04-03 09:11:03 +05:30
Mangesh-Khairnar
b2dc6ef165 style: fix the message for reason for hold 2019-04-02 18:01:14 +05:30
hello@openetech.com
ea00f8cbc3 [fix] #16894 2019-04-02 14:22:23 +05:30
Rushabh Mehta
43257c8cc3 fix(rename): Help Desk => Support 2019-04-02 08:59:15 +05:30
rohitwaghchaure
c0435f21c2 Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop
fix: incorrect  calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 23:15:17 +05:30
rohitwaghchaure
b035bf7f39 Merge pull request #17095 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo
fix: incorrect calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 23:14:56 +05:30
Nabin Hait
9d431a8a83 fix: Added link for Expense Claim in HR module page 2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6 fix: Added link for loan in HR module page 2019-04-01 20:58:20 +05:30
Himanshu Warekar
656d8e4557 fix(India): HSN Code 2019-04-01 19:38:43 +05:30
Himanshu Warekar
624477cb21 fix(India): Add HSN/SAC in setup 2019-04-01 19:25:28 +05:30
Nabin Hait
b4263a41c6 fix: Validate gl entry debit/credit as per field's precision 2019-04-01 19:11:34 +05:30
Nabin Hait
88f036a171 fix: Validate returned qty with ref qty considering field precision 2019-04-01 18:41:31 +05:30
Rohit Waghchaure
58f489fec8 fix: calcualtion of ImponibileImporto if tax rate is zero 2019-04-01 18:18:27 +05:30
Nabin Hait
0049986efd Merge pull request #17088 from nabinhait/hsn-fixes
fix: Fetch HSN code only if empty
2019-04-01 18:17:26 +05:30
Deepesh Garg
6b320bea81 fix: GSTR3b test case fix (#17094) 2019-04-01 17:55:01 +05:30
Rohit Waghchaure
ebc2437516 fix: calcualtion of ImponibileImporto if tax rate is zero 2019-04-01 17:50:31 +05:30
rohitwaghchaure
235dc4fb62 Merge pull request #17093 from rohitwaghchaure/improved_online_pos_performance
fix: pos takes more time to add an item in the cart
2019-04-01 16:46:37 +05:30
Rohit Waghchaure
6f3f2185ab fix: pos takes more time to add an item in the cart 2019-04-01 16:45:47 +05:30
Nabin Hait
51d08786dc fix: Show Sales Person in AR/AP print is optional 2019-04-01 16:24:23 +05:30
scmmishra
a409400e58 feat: added hero image field 2019-04-01 15:42:38 +05:30
scmmishra
d3bae4e8b5 feat: better cards in lms 2019-04-01 15:38:56 +05:30
rohitwaghchaure
f4d8457905 Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working
fix: POS qty decrement freezing the screen
2019-04-01 14:57:33 +05:30
Rohit Waghchaure
e994494e3e fix: POS qty decrement freezing the screen 2019-04-01 14:29:55 +05:30
Nabin Hait
f4af608408 fix: Fetch HSN code only if empty 2019-04-01 11:51:54 +05:30
deepeshgarg007
4614eb219b Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry 2019-04-01 11:48:07 +05:30
Aditya Hase
b841cb2a66 fix: Raise exception if apps are on incompatible branches 2019-04-01 11:36:57 +05:30
Nabin Hait
4873875c1c Merge pull request #17038 from netchampfaris/fix-leave-application-condition
fix: Missing "and" in filter conditions
2019-04-01 11:15:36 +05:30
Nabin Hait
093f4c529b Merge pull request #17055 from deepeshgarg007/tds
fix: TDS payable monthly report fix
2019-04-01 11:12:45 +05:30
Anurag Mishra
5402451b35 feat: Loan repayment report
Co-authored-by: crescent28 <mitali@erpnext.com>
2019-04-01 10:57:36 +05:30
rohitwaghchaure
451f25d5c2 Merge pull request #17081 from rohitwaghchaure/fix_pos_pricing_rule_code_cleanup
fix: code cleanup
2019-04-01 10:53:52 +05:30
Rohit Waghchaure
614f5adf6d fix: code cleanup 2019-04-01 10:53:08 +05:30
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
rohitwaghchaure
48bca9fbf2 Merge pull request #17076 from rohitwaghchaure/pricing_rule_pos_develop_issues_fixed
fix: Pricing rule not working for POS
2019-03-31 21:56:37 +05:30
Rohit Waghchaure
70b996af73 fix: test cases 2019-03-31 20:34:52 +05:30
scmmishra
751e75bb4c chore: set lms as home page for lms user role 2019-03-31 18:31:53 +05:30
Rohit Waghchaure
e540534e42 fix: Pricing rule not working for POS 2019-03-31 17:13:18 +05:30
deepeshgarg007
d0b98d74de fix: Allow doctype only in party account types 2019-03-30 19:44:31 +05:30
Nabin Hait
08319cecf5 Merge pull request #17074 from nabinhait/woocommerce-fix
fix: Woo-commerce fix
2019-03-30 19:12:38 +05:30
Nabin Hait
f9f04ed89e fix: woocommerce settings 2019-03-30 17:39:40 +05:30
Nabin Hait
04399e6621 Merge pull request #17073 from nabinhait/stock-report-fix
fix(stock): Fixed stock balance and stock ledger report
2019-03-30 17:05:51 +05:30
Nabin Hait
da7a193f11 fix(stock): Fixed stock balance and stock ledger report 2019-03-30 15:53:04 +05:30
Kenneth Sequeira
4f5839eb65 fixed spelling in validation message
fixed typo in auto-reorder validation message
2019-03-30 15:37:51 +05:30
Saurabh
05c8474db3 Merge branch 'hotfix' 2019-03-30 15:00:36 +05:30
Saurabh
75b4de3e20 bumped to version 11.1.18 2019-03-30 15:30:36 +06:00
rohitwaghchaure
892f675cf7 Merge pull request #17069 from frappe/revert-16950-fix-issue-credit
feat: Revert "Fix(Delivery Note): Fix issue credit note"
2019-03-30 14:25:08 +05:30
rohitwaghchaure
223bd45e06 Merge pull request #17039 from surajshetty3416/fix-bom-item-subquery-issue
fix: Subquery in get_bom_items method
2019-03-30 14:23:25 +05:30
rohitwaghchaure
f87a0e801a Merge pull request #17070 from frappe/revert-17025-fix_issue_credit
Revert: Fix issue credit note"
2019-03-30 13:45:49 +05:30
rohitwaghchaure
725f37cea5 Revert "fix(Delivery Note): Fix issue credit note" 2019-03-30 13:21:50 +05:30
rohitwaghchaure
f3a1fa0bae Revert "Fix(Delivery Note): Fix issue credit note" 2019-03-30 12:33:54 +05:30
rohitwaghchaure
b6505bddeb Merge pull request #17025 from hrwX/fix_issue_credit
fix(Delivery Note): Fix issue credit note
2019-03-30 12:31:29 +05:30
rohitwaghchaure
5fdbdd50f9 Merge pull request #16950 from hrwX/fix-issue-credit
Fix(Delivery Note): Fix issue credit note
2019-03-30 12:31:18 +05:30
Himanshu
52ae923566 fix(Update GSTIN): remove '.__' from template (#17061)
'.__'  Avoid Server Side Template Injection
2019-03-30 12:11:27 +05:30
Himanshu
20c17b8229 fix(Update GSTIN): remove '.__' from template (#17062)
'.__' Avoid Server Side Template Injection
2019-03-30 12:11:01 +05:30
rohitwaghchaure
43d79eaa92 Merge pull request #17057 from hrwX/bank_reconciliation_fix
fix(Bank Reconciliation): get credit and debit as float and not string
2019-03-30 10:16:12 +05:30
rohitwaghchaure
9d159be826 Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:14:19 +05:30
rohitwaghchaure
689a967443 Merge pull request #17065 from rohitwaghchaure/not_able_to_create_chart_of_account_develop
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:13:55 +05:30
rohitwaghchaure
d4365e25c4 Merge pull request #17063 from scmmishra/hotfix
fix: healthcare unit type enable toggle
2019-03-30 10:13:30 +05:30
Deepesh Garg
56e23e7d47 feat: GSTR1 json format download (#16887)
* feat: download gstr-1 b2b in json in its appropriate json format

* fix: download file as raw type

* feat: added logic to convert export gst data to its json

* code commonify and logic for b2cl added

* fix: Codacy and typo fixes

* fix: B2B json creation fixes

* fix: Filter customer by category

* fix: Fetch fp from to date
2019-03-29 22:22:54 +05:30
scmmishra
6f82f96816 Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix 2019-03-29 20:05:40 +05:30
rohitwaghchaure
8dadd4b0b2 Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix
fix: cherry-pick item variant test cases fix
2019-03-29 19:32:30 +05:30
Rohit Waghchaure
cc59fcd75e fix: user not able to create chart of account in parent if child has no chart of account 2019-03-29 19:23:04 +05:30
Rohit Waghchaure
fd2b1385a3 fix: user not able to create chart of account in parent if child has no chart of account 2019-03-29 19:20:47 +05:30
scmmishra
29dc744354 fix: healtcare unit type enable toggle 2019-03-29 19:00:45 +05:30
Himanshu
6343a697a2 fix(Salary Slip): Consider Leave without Pay for calculation (#16926)
while net salary calculation, it was not considering actual days worked but now it will consider it
2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab Merge pull request #17000 from scmmishra/hotfix-task-status
fix: Task overdue status propagates to project
2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2 Merge pull request #17001 from scmmishra/develop-task-status
fix: task overdue status propagates to project
2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe fix(Salary Slip): Consider Leave without Pay for calculation (#17023)
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
2019-03-29 18:32:23 +05:30
Rushabh Mehta
c4599c21c3 fix(test): item variant 2019-03-29 18:30:00 +05:30
rohitwaghchaure
fb8f1b93d6 Merge pull request #17058 from hrwX/bank_reco_fix
fix(Bank Reconciliation): get credit and debit in float and not string
2019-03-29 18:18:15 +05:30
Nabin Hait
92797eee87 Merge pull request #17052 from deepeshgarg007/patch-fix
fix: Add patch to move item tax to item tax template
2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0 Merge pull request #17045 from rmehta/fix-sla-auto-update
fix(sla): update agreement status on save'
2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca fix: get credit and debit as float and not string 2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379 fix: get credit and debit in float and not string 2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e fix: fetch account only if available 2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition 2019-03-29 16:06:38 +05:30
Rushabh Mehta
048e5f44b5 fix(test): item variant 2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716 Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12
fix: POS items not loading
2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d fix: POS items not loading 2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2 Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13 Merge branch 'deferred_revenue' into hotfix 2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700 fix(accounts): Indentation 2019-03-29 13:25:11 +05:30
scmmishra
2b7e158e50 feat: Quiz attempt limits is configurable
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
Nabin Hait
d4e038b6ca Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f Merge pull request #17046 from nabinhait/deferred_revenue
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30
deepeshgarg007
4f1926bcfe fix: Add patch to move item tax to item tax template 2019-03-29 12:10:44 +05:30
scmmishra
d4ed56af02 fix: navbar login bug 2019-03-29 11:03:34 +05:30
rohitwaghchaure
043cfe99ad Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue
fix: accounts receivable summary
2019-03-29 09:28:21 +05:30
rohitwaghchaure
c268682772 Merge pull request #17048 from rohitwaghchaure/fixed_bank_reconciliation_not_working
fix: bank reconciliation not working
2019-03-29 09:27:50 +05:30
Rohit Waghchaure
9da14747aa fix: accounts receivable summary 2019-03-29 09:26:40 +05:30
rohitwaghchaure
1296599857 Merge pull request #17042 from rohitwaghchaure/indentation_fix_pricing_rule
fix: code cleanup
2019-03-28 21:14:03 +05:30
Rohit Waghchaure
573d1dd31f fix: bank reconciliation not working 2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7 fix(accounts): codacy fixes 2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6 Refactored deferred revenue booking logic 2019-03-28 19:43:02 +05:30
Rushabh Mehta
cf33f4fd53 fix(sla): update agreement status on save' 2019-03-28 18:49:23 +05:30
Rohit Waghchaure
d5e45481cd fix: code cleanup 2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93 Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427 fix: pricing rule mixed connditions not working for item group 2019-03-28 16:51:57 +05:30
Faris Ansari
f04988a02f fix: Missing "and" in filter conditions 2019-03-28 15:42:07 +05:30
scmmishra
cea851522f feat: Added custom navbar 2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251 fix: styled program card 2019-03-28 15:32:54 +05:30
Suraj Shetty
6262c9ed6a fix: Subquery in get_bom_items method 2019-03-28 14:59:27 +05:30
scmmishra
9b7ac3e7d2 fix: fixed joining date bug on lms profile 2019-03-28 14:47:22 +05:30
scmmishra
281902f530 chore: clean up 2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf chore: Minor fixes on profile page 2019-03-28 14:34:23 +05:30
scmmishra
209250ccae fix: Profile page cards
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2 fix: layout for hero image of program card 2019-03-28 14:15:30 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +05:30
Saurabh
6cc9831ce9 Merge branch 'hotfix' 2019-03-28 13:51:58 +05:30
Saurabh
f2036dd1d1 bumped to version 11.1.17 2019-03-28 14:21:58 +06:00
scmmishra
29aaee1488 feat: Added youtube video component 2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7 feat: refactored YoutubePlayer component 2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b fix: Video stops on closing modal 2019-03-28 13:11:00 +05:30
scmmishra
526af9d268 feat: added Youtube Video component 2019-03-28 13:10:42 +05:30
Saurabh
1271dea39b Merge pull request #17035 from gaurav-naik/issue-17033
fix(regional,italy): autoset tax id, cf from customer before validating
2019-03-28 12:46:24 +05:30
rohitwaghchaure
89a2577ae5 Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview
fix(print): Fix group same items for print view
2019-03-28 12:42:22 +05:30
scmmishra
9bfe3a0315 feat: Added Program Intro Video modal 2019-03-28 12:20:24 +05:30
Gaurav
bd80fd13cb fix(regional,italy): autoset company cf, tax_id before validating 2019-03-28 12:18:03 +05:30
Saurabh
ea19250884 Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-28 11:19:44 +05:30
Faris Ansari
8fdcda7d6d Merge pull request #16411 from adityahase/dashboard
feat: Accounting Dashboard
2019-03-28 11:16:41 +05:30
Gaurav
010acf75fa fix(regional,italy): autoset tax id, cf from customer before validating missing values
Fixes issue #17033
2019-03-28 10:42:29 +05:30
Himanshu
4d45ca08de fix(Issue): Time left and display only if Agreement exists (#17014)
* fix: time left and display only if agreement

* fix: remove div if present

* code refactor

* use frappe.scrub

* code formatting

Co-Authored-By: hrwX <himanshuwarekar@yahoo.com>

* remove unused fields

* remove unsed return value
2019-03-28 07:24:54 +05:30
Suraj Shetty
a7992ecb62 style: Fix formatting 2019-03-27 20:32:42 +05:30
Suraj Shetty
abc2a64d5e fix: Commonify get gl_entry code by moving it to accounts_controller 2019-03-27 20:25:18 +05:30
scmmishra
233db67451 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-03-27 18:27:05 +05:30
scmmishra
f04ceaec95 chore: removed commented code 2019-03-27 18:14:59 +05:30
scmmishra
5b57d977d8 fix: single primary action on LMS home 2019-03-27 18:14:41 +05:30
scmmishra
3d39b88e7c feat: LMS now supports multiple correct choice questions 2019-03-27 18:01:14 +05:30
Sagar Vora
d20ecb0a71 fix(accounts): dependent field should be displayed after source link field 2019-03-27 17:42:42 +05:30
Rohit Waghchaure
1b7059b867 fix: ImponibileImporto calculation 2019-03-27 15:33:47 +05:30
scmmishra
1b63c87929 feat: refactored update status 2019-03-27 15:04:55 +05:30
scmmishra
2405e14dde Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status 2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb feat: refactored update status 2019-03-27 15:01:40 +05:30
Himanshu Warekar
a86f3a7d80 remove issue credit note 2019-03-27 10:01:18 +05:30
rohitwaghchaure
fa638443bc Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements
feat: stock entry enhancements
2019-03-26 22:50:54 +05:30
rohitwaghchaure
4510e3a836 Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making
fix: offline pos, duplicate records creating
2019-03-26 22:49:42 +05:30
Himanshu
e43b6beff0 fix(Leave Balance Report): total allocated leaves not calculated properly (#16969)
* fix: total alloted leaves not calculated properly

* fix: Possible SQL injection

* typo fix in sql query

* prevent sql injection again ?

* Use ORM for query
2019-03-26 21:42:12 +05:30
Himanshu Warekar
1b05ed042f Cost Center as per company 2019-03-26 20:25:54 +05:30
Rohit Waghchaure
22ebaf1b11 fix: added tags for discount amount, multiple customer po no, delivery notes 2019-03-26 20:19:46 +05:30
Rohit Waghchaure
1df62097f6 fix: offline pos, duplicate records creating 2019-03-26 19:15:53 +05:30
Prateeksha Singh
6d2bb9126a Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom
fix(uom): Get items as per UOM defined in BOM
2019-03-26 18:00:50 +05:30
Nabin Hait
411f66a177 Merge pull request #17006 from deepeshgarg007/account-fix
fix: Ignore root company validation setting in company master
2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0 fix: Change name to Allow Account Creation against Child Company in company master 2019-03-26 17:18:06 +05:30
Prateeksha Singh
a0927c1ba6 fix: correct use of include_item_in_manufacturing 2019-03-26 16:55:13 +05:30
Nabin Hait
8aaee57921 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-26 16:53:13 +05:30
Anurag Mishra
10c1db1b28 fix: removed empty row on getting invoices 2019-03-26 16:30:31 +05:30
rohitwaghchaure
e196b3120e Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise
feat: Stock ageing report warehouse wise
2019-03-26 16:21:17 +05:30
Anurag Mishra
ca4117e652 feat: seting status and indicators on list view 2019-03-26 16:03:00 +05:30
Anurag Mishra
702c6e00da fix: route on loan Disbursement and Closing 2019-03-26 16:00:43 +05:30
deepeshgarg007
c45c2bdabb fix: Missing semicolon 2019-03-26 15:38:38 +05:30
deepeshgarg007
7aefc15352 fix: Allow to add child account if ignore validation checked 2019-03-26 15:09:29 +05:30
Anurag Mishra
78903b1e57 fix: test for invoice payment by setting default Bank Account 2019-03-26 12:59:30 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428 renamed purpose in stock entry 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48 feat: provision to make Maintenance Schedule from sales invoice 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433 feat: added button get items from material request in stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706 Added test cases 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087 feat: added good in transit feature in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
327c194144 Added hsn code field in the stock entry item table 2019-03-26 12:52:08 +05:30
Raffael Meyer
fdbb516a1b fix(projects): Auto-set employee and company in Timesheet (#16743)
* fix(projects): auto-set employee and company

* only set employee and company if document is unsaved

* use frm.set_value()
2019-03-26 12:47:36 +05:30
rohitwaghchaure
392bc54a34 Merge pull request #16977 from rohitwaghchaure/moved_distribution_from_parent_to_child
feat: Added item group variance report for sales partner, commonified item group wise target variance report
2019-03-26 12:41:47 +05:30
Rohit Waghchaure
4ae221946b renamed report 2019-03-26 11:14:06 +05:30
deepeshgarg007
1c785a99b1 fix: Added setting in company to ignore root company validation 2019-03-25 22:32:29 +05:30
Mangesh-Khairnar
324e06cba0 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-03-25 18:51:13 +05:30
Rohit Waghchaure
1c1d0bb1c7 feat: commonified item group wise target variance report 2019-03-25 17:56:43 +05:30
rohitwaghchaure
7779bb3839 Merge pull request #17010 from rohitwaghchaure/rename_pricing_rule_child_doctypes
fix: rename pricing rule child doctype names
2019-03-25 17:50:02 +05:30
Mangesh-Khairnar
b3ec508655 feat: record reason for hold as comment 2019-03-25 17:29:14 +05:30
Mangesh-Khairnar
5e474f4664 fix: add server-side validation for closed sales order for linked material request 2019-03-25 17:28:20 +05:30
Mangesh-Khairnar
c423d6f2e4 fix: validate sales order linked work order creation on server side 2019-03-25 17:27:33 +05:30
Mangesh-Khairnar
bcb8b135f2 feat: ask reason for putting sales order on hold 2019-03-25 17:27:16 +05:30
Faris Ansari
843b7f6dd5 fix: Reorder Currency column to fix print (#17008)
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
rohitwaghchaure
0a03e3d30c Merge pull request #17011 from rohitwaghchaure/fix_incorrect_paid_amt_in_accounts_receivable_summary_report
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:41:29 +05:30
Rohit Waghchaure
4ed7d035cb fix: incorrect paid amount in accounts receivable summary report 2019-03-25 15:37:25 +05:30
Rohit Waghchaure
4792a84b5f fix: rename pricing rule child doctype names 2019-03-25 14:28:08 +05:30
rohitwaghchaure
794b6b6c0d Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix
fix: Show consolidated amount of payment entries in Bank reconciliation
2019-03-25 14:11:47 +05:30
Rushabh Mehta
5770ad9e8c Merge pull request #16963 from itusedyetnew/develop
Fix:stock_values_on removed append function on string
2019-03-25 12:03:53 +05:30
Rushabh Mehta
689490e4de Merge pull request #16986 from hrwX/italy_xml_fix
fix(Italy Customisation): Include fiscal code in invoice xml if present
2019-03-25 11:57:30 +05:30
deepeshgarg007
4f9ac0ad55 fix: Child company account currency fix 2019-03-25 11:39:25 +05:30
Shivam Mishra
ec56122876 fix: minor fix in test 2019-03-25 11:36:43 +05:30
scmmishra
26e5c753db fix: Typo in update_status 2019-03-25 11:35:28 +05:30
scmmishra
1af3c41da3 fix: Typo in update_status 2019-03-25 11:34:33 +05:30
Suraj Shetty
67876d1026 fix: Show amount of entry based on diff of credit and debit 2019-03-25 11:19:07 +05:30
scmmishra
f7f32634c8 feat: Added check for no end date and refactored query 2019-03-24 20:43:15 +05:30
scmmishra
a2e801e840 fix: Added check for no end date 2019-03-24 20:38:47 +05:30
scmmishra
5869ba1470 feat: Added filter to query 2019-03-24 20:27:32 +05:30
scmmishra
e7cf06b3c6 fix: task overdue status propagates to project 2019-03-24 18:23:41 +05:30
scmmishra
6ab6d35f92 fix: Task Overdue status propagates to project
- Used ORM instead of a SQL for set_task_as_overdue
- update_status function compares the time and marks the appropriate task as overdue
- The on_update hook makes the changes in project as well
2019-03-24 18:17:13 +05:30
rohitwaghchaure
6fabcdd5b3 Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports
feat: sales partner reports
2019-03-24 14:52:45 +05:30
rohitwaghchaure
9673d0ddae fix: description missing in the XML (#16985) 2019-03-24 12:19:58 +05:30
Himanshu Warekar
92593bb717 fix: Cost center as per company 2019-03-23 19:46:31 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Frappe Bot
0f1271612a Merge branch 'hotfix' 2019-03-23 07:25:02 +00:00
Frappe Bot
021ccf572a bumped to version 11.1.16 2019-03-23 07:25:02 +00:00
Zarrar
963d62b701 feat: Chart of Accounts Importer (#16623)
* bare doctype created for COA utility

* improvise doctype's design

* validation to check no transaction exist for the company

* download file and import coa - client side logic added

* download csv template to create custom chart

* read the custom csv uploaded and parse it to appropriate format

* convert list of list to nested tree structure

* preview the uploaded chart before actual import

* toggle field based on necessity

* tweak create_charts and build_json logic to incorporate COA Import utility

* code cleanify and validation call added

* code enhancement for flexibility and validation added

* show import button only if data is validated

* unset existing data and load new accounts

* disable coa fields if parent_company set, minor improv

* file api fix

* added progress bar

* codacy fixes

* fix: Add account number in template

* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Himanshu
138e030055 CodiceFiscale should be after IdFiscaleIVA 2019-03-22 23:22:52 +05:30
Saif Ur Rehman
7d1c1aa28f fix(Party Ledger Summary): Show all adjustment entries as columns
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
2019-03-22 17:18:32 +05:00
Himanshu Warekar
1d04ea1212 fix: include fiscal code in invoice xml if present 2019-03-22 17:47:57 +05:30
Prateeksha Singh
81f4d1c745 Merge pull request #16947 from pratu16x7/stock_entry_from_bom
fix(uom): Get items as per UOM defined in BOM
2019-03-22 16:20:17 +05:30
rohitwaghchaure
56e491bccd Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields
feat: enabled allow on submit for action fields in the Budget
2019-03-22 15:34:41 +05:30
Prateeksha Singh
cc1a022d63 fix: correct use of include_item_in_manufacturing 2019-03-22 14:58:22 +05:30
Rushabh Mehta
d562e9530e fix(link): help link in selling 2019-03-22 14:46:12 +05:30
Rushabh Mehta
c0de5b741e fix: remove gitter chat 2019-03-22 14:32:00 +05:30
Nabin Hait
95705412f3 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-22 13:19:17 +05:30
Rushabh Mehta
da87a491ab Merge pull request #16816 from finbyz/hotfix
fix: Rounding adjustment in Rounded Total
2019-03-22 12:51:09 +05:30
Rushabh Mehta
dc7d5853b4 Merge pull request #16608 from Alchez/hotfix-work-order-item-name
fix(work_order): Add item name in Work Order
2019-03-22 12:49:05 +05:30
Rushabh Mehta
2537b7fce8 Merge branch 'develop' into hotfix-work-order-item-name 2019-03-22 12:48:56 +05:30
Rushabh Mehta
7678c7b179 Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12
feat: Brand Item Defaults (v12)
2019-03-22 12:46:04 +05:30
Rushabh Mehta
ff04142d9b Merge pull request #16848 from alyf-de/hotfix-1
fix(projects): change fieldtype of billing amounts to Currency
2019-03-22 12:44:18 +05:30
Rushabh Mehta
7defd6f3b5 Merge pull request #16749 from Alchez/hotfix-cancelled-payments
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
2019-03-22 12:43:52 +05:30
Rushabh Mehta
b0a7cbb591 Merge pull request #16905 from frappe/netchampfaris-patch-1
fix: Update Training Level
2019-03-22 12:43:00 +05:30
Rushabh Mehta
199aae0fe8 Merge pull request #16861 from Anurag810/asset_fixes
fix: passing the correct argument in get_depreciation_amount
2019-03-22 12:42:46 +05:30
Rushabh Mehta
fc4eefcb22 Merge pull request #16871 from rmehta/attendance-from-leave
feat: Pre mark attendance for Leave Application
2019-03-22 12:41:47 +05:30
Rohit Waghchaure
9c214b6129 feat: enabled allow on submit for action fields in the Budget 2019-03-22 12:08:09 +05:30
Rushabh Mehta
2f9c7171fa Merge pull request #16980 from chdecultot/fec_correctioon
fix: [Regional] [FEC report] Mapping issue in sql query
2019-03-22 12:05:51 +05:30
Deepesh Garg
22b61607c6 feat: GSTR3B Report JSON creation and Print Format (#16595)
* feat: Created doctype for GSTR3B report and added boilerplate code

* feat: Updated gst_fields and patches for gst_category

* feat: Functions for calculating itc amount

* fix: Patched eligibility_for_itc_field

* fix: Updated set_category for gst

* fix: Function for setting iter_state supplies

* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format

* fix(style): Added missing semicolon and removed unused imports

* fix: Patch field only if column is available

* fix: Make custom fields only for india sepecific company

* fix: Add intro to gstr3b report

* fix: Updated patch in patches.txt

* fix: Update patches.txt

* fix: Update patch to set GST Category

* fix: Add fields for nil rated and non gst in item master

* fix: Added logic for nil rated and non gst inward flow

* fix: Initial test case for GSTR3B Report

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Add link for gstr_3b_report in accounting module

* fix: Updated report template

* fix: Changes in GSTR3B Report doctype

* fix: Added function to get missing field invoices

* fix: Added more test cases

* fix: Item not found error in test case

* fix: Key error in state numbers

* fix: Changes in GSTR3b Doctype

* fix: Changed functions to method

* fix: Minor fix in patch

* fix: Add gst_ctegory in GST Reports

* fix: Minor fixes in patch and itc_mapping

* fix: Query to patch itc field

* fix: Patch registered customers and fix for multiple gst accounts

* fix: Test case

* fix: Total taxable calculation logic fix and template enhancement

* fix: Calculate txval seperately

* fix: itc amount calculation fix and patch improvement

* fix: Updated test_cases for itc calculation

* fix: Missing field query

* fix: Multiple minor fixes inreport

* fix: Added transalations in GSTR3B-Form

* fix: Use double underscore for translation

* fix: GST fields ordering fix

* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30
Charles-Henri Decultot
a7cf7fbccc Fix: Mapping issue in sql query 2019-03-21 13:28:14 +00:00
Deepesh Garg
3a05b3501c fix: Failing test case on develop (#16974) 2019-03-21 12:53:12 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Saurabh
ce8d20c489 Merge branch 'hotfix' 2019-03-20 14:33:01 +05:30
Saurabh
83cc587f8f bumped to version 11.1.15 2019-03-20 15:03:00 +06:00
Faris Ansari
3ba91d7e19 fix: Add /all-products to sitemap 2019-03-20 14:11:22 +05:30
Faris Ansari
d77fe38513 fix: Remove no_sitemap property 2019-03-20 14:11:05 +05:30
rohitwaghchaure
f45db71ba2 Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working
fix: Cost center from PO to PI is not mapping
2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130 fix: Cost center from PO to PI is not mapping 2019-03-20 13:34:28 +05:30
Mangesh-Khairnar
2ffa87ea34 feat: added erpnext doctype via hooks (#16930) 2019-03-20 13:25:48 +05:30
scmmishra
43e9375642 feat [WIP]: Added multiple choice question component 2019-03-20 13:25:02 +05:30
Rohit Waghchaure
65d9435fd5 feat: sales partner reports 2019-03-20 12:05:21 +05:30
itusedyetnew
8aafbd22de stock_values_on append function on string 2019-03-20 11:10:41 +05:30
Rohit Waghchaure
ca9f93cdc2 feat: Stock ageing warehouse wise 2019-03-20 02:14:54 +05:30
rohitwaghchaure
e521f51e5f Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:17:15 +05:30
Mangesh-Khairnar
7fc1bc0b27 fix: handle an empty match query condition in leave application (#16931) 2019-03-19 18:14:02 +05:30
Rohit Waghchaure
a322687897 fix: Accounts receivable report, remarks showing in the sales person column 2019-03-19 18:10:08 +05:30
Himanshu
f3e5213190 feat(Support): Service Level Agreements (#16828)
* init SLA

* Added more inputs to the forms

* set priority of issue

* Removed UOM in favor of hours for tracking

* updated js to autofill values

* Removed unwanted fields

* timer functionality

* code refactor

* parenthesis fix

* fixed typo

* added new fields

* Updated fields

* Updated fields for issue doctype

* Updated fields for issue doctype

* changed doctype structure

* added new fields to issue

* code refactor

* new function to set criticality level

* changed dropdown options

* set timer for sla

* calculation of resolution and response time

* stopwatch counter

* dashboard changes

* renamed sla to support contract

* countdown timer section

* issue doctype changes

* removed unwanted imports

* fixed wrong response time and resolution time

* update response and resolution time

* calculate time to respond and resolve

* feature enhancements

* probable scheduling bug fix

* fixed scheduling issue support sent out of support time

* removed issue criticality link from support

* Changed day order

* skip date validation when support contract is default

* removed mandatory field

* fix scheduling conditions for now

* code refactor

* removed duplicate doctypes

* fixed day inserted twice in service level

* check to not add another default contract

* default support contracts

* removed commented code

* removed unused imports

* fix sla for non-listed days

* reduced redundant code and optimized it and starting unit tests

* added condition check to compute days correctly

* renamed doc as per guidelines and added conditions for scheduling

* removed per day support timings

* added response and resolution time to support contract

* scheduling based on hours kinda fix

* set sla before_update and finally fixed time scheduling out of support time

* DocType Issue removed test_records and rewrote test cases

* test cases and codacy fixes

* Doctype SLA instead of Support Contract to avoid confusion with Contract

* fixed tests failing due to change in options for time period

* change naming to Prompt

* remove unknown doctype from help_desk

* revert unwanted changes to default

* refactor get_list for fetching service_level_agreement

* change datatypes

* fix tests

* refactored tests

* remove unused imports

* code and comments refactor for better understandability

* removed and renamed doctype to service days and minor fixes

* Refactor test cases for response and resolution time for issue

* add validation to check if response time < resolution time

* minor fix for checking if current day is start day

* calculate time in js rather than python

* fix: parenthesis fixing customer dashboard

* json changes to rename sections

* refactor: alignment

* refactor: beautify code

* fix: use frm api to get the element

* fix: replace '__' with '_'

* refactor: remove pointless test
2019-03-19 16:47:56 +05:30
rohitwaghchaure
40046721b2 Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors
fix: POS, cost center not added against debtors
2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e fix: POS, cost center not added against debtors 2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a fix: advance amount is not calculating properly 2019-03-19 15:06:01 +05:30
rohitwaghchaure
51eec69164 Merge pull request #16948 from rohitwaghchaure/v12_new_pricing_rule_feat
feat: pricing rule enhancements
2019-03-19 14:39:18 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
scmmishra
000e706337 feat: Only student progress is recorded in LMS
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4 Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rushabh Mehta
1e7d768a45 Merge pull request #16951 from hrwX/change-to-supplier
fix(Supplier Ledger Summary): Change Customer to Supplier in Supplier Ledger Summary
2019-03-19 09:47:14 +05:30
Himanshu Warekar
642a5b69f5 fix: change customer to supplier 2019-03-18 21:53:33 +05:30
Himanshu Warekar
2f5f17fcbb refactor: fix issue credit note 2019-03-18 21:46:26 +05:30
scmmishra
7ad5619318 feat: Set default role to LMS User for signup in Education 2019-03-18 19:11:44 +05:30
scmmishra
eaed1ae3d6 fix: Added import statement for translate wrapper 2019-03-18 19:11:07 +05:30
scmmishra
f2c638f8ab fix (minor): Replaced text editor with small text in course doctype 2019-03-18 18:38:51 +05:30
scmmishra
acc278de9c feat: Added validations for question doctype
- A question must have more than two options
- A question must have at least one correct option
2019-03-18 18:38:18 +05:30
scmmishra
5c646e60f5 fix: Auto course enrollment for enrolled programs in LMS 2019-03-18 18:37:35 +05:30
scmmishra
a0978a2aab chore: Cleaned up quiz.py 2019-03-18 18:37:06 +05:30
Rushabh Mehta
f060831cce fix(escaping): make_italian_localization_fields.py 2019-03-18 18:04:34 +05:30
rohitwaghchaure
2a4d4036f6 Merge pull request #16946 from rohitwaghchaure/minor_fix_debug
code cleanup
2019-03-18 17:01:23 +05:30
Rohit Waghchaure
5b43e2f31a code cleanup 2019-03-18 17:00:44 +05:30
rohitwaghchaure
2046024de9 Merge pull request #16942 from hrwX/invoice-creation-tool
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
2019-03-18 15:48:55 +05:30
scmmishra
e3dea29f58 fix: Minor UI fix 2019-03-18 15:44:55 +05:30
Himanshu
ac199580af fix(Customer Ledger): ambiguous error in where clause (#16914)
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
2019-03-18 15:44:54 +05:30
rohitwaghchaure
4c8627e88d Merge pull request #16523 from Zlash65/comp-sync
feat: Sync Chart of Accounts in Company hierarchy
2019-03-18 15:43:50 +05:30
scmmishra
621cad8781 fix: Default program list
Shows two latest programs if no program is set as featured
2019-03-18 15:40:47 +05:30
scmmishra
c22eef28f7 fix: LMS Title
Shows default company name if LMS title not set
2019-03-18 15:36:49 +05:30
scmmishra
dcbe7e5490 fix: Added permissions for instructor
Also made description mandatory in program
2019-03-18 15:29:30 +05:30
scmmishra
b2c745827f fix: Removed accidentally added course doctype in list 2019-03-18 15:28:49 +05:30
rohitwaghchaure
ac9f38bfc2 Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap
feat: added cost center filter in AR/AP reports
2019-03-18 14:22:15 +05:30
Rohit Waghchaure
d4e4316d0b fix: test cases and codacy 2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c codacy fixes 2019-03-18 12:50:29 +05:30
Zlash65
11bba571af test case added to check account syncing 2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62 fix: chart of accounts field toggling improv 2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d fix: return if no descendants found 2019-03-18 12:50:28 +05:30
Zlash65
73acb8c837 fix: set chart of accounts based on parent company on server side 2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e feat: sync account created for a group company to all its descendants 2019-03-18 12:50:28 +05:30
Zlash65
88c990901d fix: added validation to if account is being added to child company 2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00 fix: override primary action button, change filter to root company 2019-03-18 12:50:27 +05:30
Zlash65
2def228da8 feat: allow adding account only if topmost parent company
- hidden filter for Parent Company added
- Add button overriden with new condition
2019-03-18 12:50:27 +05:30
Zlash65
a57d58f756 feat: once company is saved, parent_company cannot be selected 2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090 feat: selecting parent_company should disable chart_of_accounts based fields 2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56 disbale pl check for Sales and Purchase Invoice 2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Mangesh-Khairnar
db96db2897 style: change position of hold and resume button 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
e613c4f380 test: purchase order on hold 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
873c579bb4 fix: check for both hold and closed status in po 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
4f74313baf feat: record reason for hold as comment 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723 feat: add validation for on hold purchase order 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
439546c83c feat: add on hold status in purchase order 2019-03-18 12:14:25 +05:30
scmmishra
b854d64401 Merge branch 'develop' of github.com:frappe/erpnext into lms-beta-v2 2019-03-18 11:51:27 +05:30
Suraj Shetty
4713e2dd73 Merge pull request #16929 from Mangesh-Khairnar/email-address-fix
refactor: change validate email add to validate email address
2019-03-18 11:26:14 +05:30
Aditya Hase
42640cb908 fix(dashboard): Add configuration to chart source 2019-03-18 11:18:43 +05:30
Deepesh Garg
3ead70ba3c fix: Change IBAN Account length from 25 to 30 (#16847) 2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0 fix: Gross profit report fix (#16935) 2019-03-17 09:49:24 +05:30
Mangesh-Khairnar
b343407236 refactor: change validate email add to validate email address 2019-03-16 13:40:58 +05:30
rohitwaghchaure
fd33c55760 Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit
feat: added provision to disable CWIP accounting in asset settings
2019-03-16 12:18:36 +05:30
rushin29
08a209bc52 fix: gst_state_number for address with Unregistered GST (#16798) 2019-03-15 15:28:50 +05:30
rohitwaghchaure
ef74e94374 Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card
feat: child table to add multiple time logs in job card
2019-03-15 11:46:33 +05:30
Rushabh Mehta
349a1157ef Merge pull request #16717 from jigartarpara/fix_payment_term_template
fix: Add credit month in validation
2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222 Merge pull request #16851 from JoyceBabu/develop
fix: Add 'Half-Yearly' option to Earned Leave Frequency
2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae Merge pull request #16634 from Alchez/hotfix-stock-balance-balance
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
2019-03-15 09:02:20 +05:30
Rushabh Mehta
59a3012a5c Update payment_request.py 2019-03-15 08:57:49 +05:30
Rushabh Mehta
e5d79f3621 Merge pull request #16673 from Alchez/feat-task-from-issue
feat(issue): Create and view Tasks from Issues
2019-03-15 08:55:20 +05:30
Anurag Mishra
ed190bb329 fix: codacy 2019-03-14 18:14:20 +05:30
Anurag Mishra
1c7baaeba5 test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices 2019-03-14 16:45:02 +05:30
Anurag Mishra
6deffbd6e8 test: loan_return date and loan Sanctioned on submit 2019-03-14 16:44:49 +05:30
Anurag Mishra
4a538ba78a Resolve merge conflict 2019-03-14 16:43:16 +05:30
Nabin Hait
ed96591618 feat(accounts): Invoice Discounting 2019-03-14 16:42:44 +05:30
scmmishra
0bcae95d3c chore: Fixed config for education 2019-03-14 15:46:51 +05:30
scmmishra
21823f5f66 feat: Added test for program_enrollment 2019-03-14 15:44:01 +05:30
scmmishra
e3b7e1381d feat: Moved make_course_activity to test_course_activity.py 2019-03-14 15:34:13 +05:30
scmmishra
8aa6ac7b03 feat: Moved setup_program to test_program.py 2019-03-14 15:32:22 +05:30
scmmishra
a98e936d26 chore: Removed LMS Activity Doctype 2019-03-14 15:24:26 +05:30
scmmishra
88b2244468 feat: Added test for course_enrollment 2019-03-14 15:19:20 +05:30
scmmishra
c75b513e2c fix: Enrollment bug 2019-03-14 15:16:14 +05:30
scmmishra
34fa33d324 fix: Config bug, added type doctype 2019-03-14 15:14:25 +05:30
Bassam Ramadan
e14758c897 fix: add returns field to cashier closing (#16911) 2019-03-14 15:01:50 +05:30
Rushabh Mehta
947d573276 Merge pull request #16892 from hrwX/uae_fix
fix(UAE): Fetch from fix for UAE customizations
2019-03-14 14:20:32 +05:30
Rushabh Mehta
e8258fc352 Merge pull request #16854 from jay-parikh/hotfix
fix: Default Company to Total Stock Summary Report
2019-03-14 14:18:36 +05:30
Rushabh Mehta
2352ce92cc Merge pull request #16849 from frappe/bcornwellmott-patch-1
fix: Add date to currency exchange caching
2019-03-14 14:18:09 +05:30
Rushabh Mehta
d63e0f490c Merge pull request #16856 from hrwX/sales-work-fix
fix(Work Order): fetch item info when making work order from sales order
2019-03-14 14:17:40 +05:30
Rushabh Mehta
20af5a2b40 Merge pull request #16866 from deepeshgarg007/additional
fix: Removed relieving date validation form additional salary
2019-03-14 14:16:18 +05:30
Rushabh Mehta
bd9622bfd5 Merge pull request #16918 from Alchez/hotfix-party-payments
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 14:14:42 +05:30
Rohan Bansal
82433845e5 fix(transaction): Add link to payments made by Customer / Supplier in their dashboards 2019-03-14 13:18:55 +05:30
scmmishra
14d70ce444 chore: updated education config 2019-03-14 12:31:25 +05:30
Rushabh Mehta
f49d0d8058 Merge pull request #16890 from Anurag810/timesheet
feat: Timesheet Reports
2019-03-14 10:31:23 +05:30
Rushabh Mehta
6e2286f5f0 Merge pull request #16897 from PawanMeh/fixes_16894
fixes: Amazon v12 integration issues
2019-03-14 10:30:29 +05:30
Aditya Hase
3b75551739 feat(dashboard): Render Account Balance Timeline is a time series 2019-03-12 14:47:21 +05:30
Aditya Hase
59fc039c77 style: Linting fixes 2019-03-12 14:47:21 +05:30
Aditya Hase
1e0f9a2882 feat(dashboard): Use caching decorator for dashboard 2019-03-12 14:47:21 +05:30
Aditya Hase
76158e6643 feat(dashboard): Export chart source doc to JSON file 2019-03-12 14:47:21 +05:30
Aditya Hase
675c1d3a5a refactor(dashboard): Move Soure settings to account_balance_timeline.js 2019-03-12 14:47:20 +05:30
Aditya Hase
09f2ed2e69 refactor(dashboard): Move dashboard.py to account_balance_timeline.py 2019-03-12 14:47:20 +05:30
Aditya Hase
d85b0ae602 fix(dashboard): Remove unused variables 2019-03-12 14:47:20 +05:30
Aditya Hase
2fa1d9caed fix(dashboard): Remove print statement 2019-03-12 14:47:20 +05:30
Aditya Hase
15c0cfff0f refactor(dashboard): Convert indentation to tabs 2019-03-12 14:47:20 +05:30
Aditya Hase
4b171ddebb feat(dashboard): Remove hardcoded company filter 2019-03-12 14:47:20 +05:30
Aditya Hase
3b593e44c6 feat(dashboard): Set account from filters 2019-03-12 14:47:20 +05:30
Aditya Hase
5911e100ad fix(dashboard): Consider opening balance 2019-03-12 14:47:20 +05:30
Aditya Hase
6cadf77073 feat(dashboard): Add Time Grain filter 2019-03-12 14:47:20 +05:30
Aditya Hase
c888e52788 feat(dashboard): Add missing dates 2019-03-12 14:47:20 +05:30
Aditya Hase
8896374413 feat(dashboard): Add timespan filter 2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47 feat(dashboard): Create Accounting dashboard from General Ledger Report 2019-03-12 14:47:20 +05:30
Anurag Mishra
641e412853 fix: Removed raw query and used frappe.get_all 2019-03-12 13:12:31 +05:30
Rohan Bansal
f4bce6a66e fix(issue): Replace Make buttons on Issue and Task with a dashboard 2019-03-12 12:48:13 +05:30
Rohan Bansal
bf7c69f3c4 fix(issue): Don't auto-set project 2019-03-12 12:48:13 +05:30
Rohan Bansal
fa77b591ac fix(issue): View Tasks against an Issue 2019-03-12 12:48:13 +05:30
Rohan Bansal
2ba21fb66c fix(issue): Add issue name in Task and fix description in Issue 2019-03-12 12:48:13 +05:30
Rohan Bansal
5327d0253d feat(issue): Create tasks from issues 2019-03-12 12:40:32 +05:30
Rohan Bansal
6cbd3998fb fix(work_order): Use single update query 2019-03-12 12:15:37 +05:30
Rohan Bansal
b4745ec668 fix(work_order): Change Work Order title to show item name instead of item code 2019-03-12 12:13:02 +05:30
Anurag Mishra
9a1adc7c49 Added mandatory feilds to the report 2019-03-12 11:00:02 +05:30
Faris Ansari
47f1080f1e fix: Update modified 2019-03-12 10:57:35 +05:30
Faris Ansari
175709ed50 fix: Update Training Level
- Rename Expert to Intermediate, since it was ambiguous with Advance
2019-03-12 10:55:39 +05:30
Faris Ansari
2221151132 fix: Update Training Level 2019-03-12 10:55:11 +05:30
Anurag Mishra
34e1f92a7e fix: readability 2019-03-11 18:17:22 +05:30
Anurag Mishra
1218255178 feat: Project Billing Summary for timesheet 2019-03-11 17:43:44 +05:30
Rohan Bansal
90972cfbf9 fix(transaction): Avoid shipping rule charge override by tax template 2019-03-11 15:00:48 +05:30
pawan
c0e1000919 fix: SKU issue 2019-03-11 14:58:17 +05:30
rohitwaghchaure
94561607f0 Merge pull request #16893 from rohitwaghchaure/stock_ledger_report_not_working_v12
fix: stock ledgre report not working
2019-03-11 14:52:17 +05:30
pawan
7c3e017ac3 fix: Amazon integration issues 2019-03-11 14:47:57 +05:30
Rohit Waghchaure
267723f57b fix: stock ledgre report not working 2019-03-11 14:06:00 +05:30
Anurag Mishra
9b64baa734 Minor Fixes 2019-03-11 12:02:25 +05:30
Anurag Mishra
59f4556d95 Commonify code 2019-03-11 11:58:34 +05:30
Anurag Mishra
e86ac3c8d4 feat: timesheet Employee Summary Report 2019-03-11 11:58:28 +05:30
Rohit Waghchaure
52729bf369 feat: child table to add multiple time logs in job card 2019-03-11 00:02:32 +05:30
Himanshu Warekar
1692fbaf1c fetch from fix 2019-03-08 18:37:34 +05:30
Frappe Bot
2ae018a653 Merge branch 'hotfix' 2019-03-08 09:39:33 +00:00
Frappe Bot
7e67a400cd Merge branch 'master' into develop 2019-03-08 09:39:33 +00:00
Frappe Bot
3406229152 bumped to version 11.1.14 2019-03-08 09:39:32 +00:00
Rushabh Mehta
96842c9de6 fix(typo): leave_application.py 2019-03-08 12:36:43 +05:30
Rushabh Mehta
701c0b792c feat: Pre mark attendance for Leave Application 2019-03-08 12:30:42 +05:30
Rohit Waghchaure
6b33c9b934 fix: purchase receipt not able to submit because default inventory account has not selected in another company 2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Nabin Hait
9ec4816b32 Update item_barcode_childtable_migrate.py 2019-03-08 10:44:13 +05:30
Saif Ur Rehman
e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
deepeshgarg007
78a32ae172 fix: Remove validation for relieving date from additional salary 2019-03-07 20:00:07 +05:30
Anurag Mishra
1b0f5fd430 fix: pass correct argument to method get_deprication_amount 2019-03-07 16:17:00 +05:30
Rushabh Mehta
703a597478 fix(patch): update customization options if completed is not present 2019-03-07 13:03:40 +05:30
Rushabh Mehta
e9db0d2c61 fix(minor): update task list label from Closed to Completed 2019-03-07 12:50:02 +05:30
rohitwaghchaure
d4754619d0 Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table
fix: scan barcode not adding the barcode value in the items table
2019-03-07 11:29:56 +05:30
rohitwaghchaure
d06212e408 Merge pull request #16853 from rohitwaghchaure/pos_profile_changes
fix: POS profile, account for change amount must be cash or bank account
2019-03-07 11:28:25 +05:30
Himanshu Warekar
7ab961f798 remove debug code 2019-03-06 23:53:38 +05:30
Himanshu Warekar
59699bf46e [debug] locally tests passed but travis failed 2019-03-06 23:33:03 +05:30
Himanshu Warekar
4f1737c2dd fix sales order test for creating work order from sales order 2019-03-06 22:19:15 +05:30
scmmishra
62416224ab feat: Added test utilities for course_activity 2019-03-06 19:01:28 +05:30
Himanshu Warekar
783331c645 sales_order to work_order item desc fix 2019-03-06 18:44:04 +05:30
Rohit Waghchaure
db8500c03a POS profile, account for change amount must be cash or bank account 2019-03-06 18:28:45 +05:30
Jay Parikh
9757a603fa Fix Company Default to Total Stock Summary Report 2019-03-06 12:44:41 +00:00
scmmishra
18ddc92947 feat: Added check for duplicate course enrollment 2019-03-06 17:05:17 +05:30
scmmishra
890ce60e86 style: Removed trailing spaces 2019-03-06 17:04:42 +05:30
scmmishra
531d2761cf feat: Refactored some enrollment functions 2019-03-06 17:04:17 +05:30
scmmishra
b72ba416ff feat: More tests 2019-03-06 17:03:51 +05:30
Rohan Bansal
e66f59654e fix(report): Incorrectdata for balance quantity and value in Stock Balance report 2019-03-06 16:04:11 +05:30
scmmishra
bf9a10fd5e chore(style): Renamed a function 2019-03-06 15:45:35 +05:30
scmmishra
bcfe6f024f feat: Added lms tests for student doctype 2019-03-06 15:26:41 +05:30
scmmishra
92ab107b60 fix: Minor fix 2019-03-06 15:26:20 +05:30
scmmishra
4a7e2c1e2f feat: Minor changes to topic tests 2019-03-06 15:19:02 +05:30
scmmishra
2cec025bbe feat: Added test for program doctype 2019-03-06 15:18:43 +05:30
scmmishra
64347a5642 feat: Added test for Course Doctype 2019-03-06 15:18:27 +05:30
scmmishra
75defde940 fix: fixed user creation bug in student 2019-03-06 15:18:01 +05:30
Rushabh Mehta
29c46bb311 fix(sales_order.py): handle zero bundle qty 2019-03-06 14:49:13 +05:30
Joyce Babu
3d0121369f Add 'Half-Yearly' option to Earned Leave Frequency
in addition to the current values of Monthly, Quarterly and Yearly
2019-03-06 13:04:45 +05:30
scmmishra
18a1a8d4f4 style: Fixed route.js 2019-03-06 10:55:21 +05:30
bcornwellmott
b263876918 Add date to currency exchange caching
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
2019-03-05 16:44:02 -08:00
Raffael Meyer
33d0a9f684 fix(projects): change fieldtype of billing amounts to Currency 2019-03-05 21:57:11 +01:00
Prateeksha Singh
6e28ef425a Merge pull request #16845 from hrwX/additional_salary_develop
fix(Additional Salary): Additional salary develop
2019-03-05 17:49:23 +05:30
Himanshu Warekar
250ebe5888 Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop 2019-03-05 17:45:14 +05:30
Himanshu Warekar
219b9f4150 Salary Component can be equal to zero 2019-03-05 17:44:07 +05:30
Prateeksha Singh
fb491a568f Merge pull request #16842 from hrwX/additional_salary
fix(Additional Salary): Allow additional salary to be zero
2019-03-05 17:34:37 +05:30
Prateeksha Singh
e2e4028b39 Merge pull request #16844 from deepeshgarg007/desktop
fix: Removed shortcuts from desktop.py
2019-03-05 17:23:52 +05:30
deepeshgarg007
e062acbbd3 fix: Removed shortcuts from desktop.py 2019-03-05 17:17:10 +05:30
Himanshu Warekar
acb7238ad6 Allow zero amount in additional salary 2019-03-05 12:20:19 +05:30
Rushabh Mehta
1f0792d5ea Merge pull request #16823 from jay-parikh/sales-return
fix: Python 3 Sales Invoice Return Validation "validate_pos"
2019-03-05 08:05:00 +05:30
rohitwaghchaure
55c382a780 Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes
fix: on save of the address, state code field become blank
2019-03-04 16:59:45 +05:30
rohitwaghchaure
f6a8b17717 Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description
fix(sales order item): not able to search item by description
2019-03-04 16:59:19 +05:30
rohitwaghchaure
369d20ac2b Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6 Merge pull request #16704 from Anurag810/vedmata-print-formats
feat: Auditors print formats
2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19 Merge pull request #16629 from Anurag810/gross-and-net-profit-report
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf Minor fixes 2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc fix: gross depends upon now report type 2019-03-04 14:46:28 +05:30
Prateeksha Singh
a5f2962c16 Merge pull request #16830 from pratu16x7/explore-2.0
minor(modules): add onboard keys, remove hidden
2019-03-04 14:39:29 +05:30
Aditya Hase
711ac5ae24 Merge pull request #16826 from deepeshgarg007/test_fix
fix: Account type fix in test_united_states
2019-03-04 14:21:54 +05:30
scmmishra
28dd4c139e feat: Added test for Topic Doctype
- Added test for get_contents function
- Removed unused class functions
2019-03-04 14:21:22 +05:30
Prateeksha Singh
8aa4594b1e feat(modules): add onboard keys, remove hidden 2019-03-04 14:00:26 +05:30
Rohit Waghchaure
9842ce5a79 fix: HSN code not disaplying for the GST Purchase Invoice print format 2019-03-04 13:39:52 +05:30
deepeshgarg007
511713e131 fix: Delete GL entry for supplier before creating new one 2019-03-04 13:25:39 +05:30
deepeshgarg007
e615051ccc fix: Updated test_united_states 2019-03-04 13:22:51 +05:30
Deepesh Garg
44ff41188d fix: Selling and buying amount precision fix (#16764) 2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7 fix: Print letter head only if checked in Print Settings (#16789)
Letter head is printed in financial statements even if option is not checked

![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)
2019-03-04 12:53:11 +05:30
Deepesh Garg
e1f72cc010 revert: Address and contact report fix (#16786)
Reverts #16674 

Address and other info are not visible in address and contact report
![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png)
2019-03-04 12:49:39 +05:30
Anurag Mishra
1e4e61bd94 Minor fixes 2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68 minor fixes 2019-03-04 12:27:41 +05:30
deepeshgarg007
f6d1f53aef fix: Account type fix in test_united_states 2019-03-04 10:23:35 +05:30
Mangesh-Khairnar
83f1fbdc4e test: assert validation error for sales order on hold 2019-03-02 22:24:23 +05:30
Rohit Waghchaure
2bfb063fdb fix(sales order item): not able to search item by description 2019-03-02 21:47:55 +05:30
Mangesh-Khairnar
3ebeac13e9 feat: add resume funtionality for sales order on hold 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
86e650c1ed feat: validate linked sales order on material request creation 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
8f7c7a6882 feat: check for on hold sales order 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
4f350fcadb feat: validate sales order in sales invoice 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
1c276e9828 feat: validate on hold sales order 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
602223dd55 feat: add a option of on hold in sales order 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
5eb66aed77 feat: add on hold status check 2019-03-02 20:48:03 +05:30
Mangesh-Khairnar
e17b7095bf feat(sales order on hold): check status of sales order to validate entry 2019-03-02 20:48:03 +05:30
Jay Parikh
c2090939d7 Fix Sales Invoice Return Validation "validate_pos" 2019-03-02 12:19:32 +00:00
Rohit Waghchaure
4ef924d0ba fix: on save state code field become blank 2019-03-01 18:11:43 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
Frappe Bot
9ce994a320 Merge branch 'hotfix' 2019-03-01 09:12:25 +00:00
Frappe Bot
3ec0bb7e53 bumped to version 11.1.13 2019-03-01 09:12:25 +00:00
rohitwaghchaure
066da6b1b6 Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix
fix(regional,italy): bank details, custom button on sales invoice
2019-03-01 14:26:07 +05:30
rohitwaghchaure
5e71a56c7a Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
2019-03-01 14:25:00 +05:30
Gaurav
6a4625b94c fix(regional,italy): codacy fixes in regional sales_invoice js 2019-03-01 13:58:39 +05:30
Gaurav
b30a9b1869 fix(regional,italy): bank details, custom button on sales invoice
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103 fix: Rounding adjustment in Rounded Total
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
2019-03-01 11:57:06 +05:30
Rushabh Mehta
94d6f94e0e Merge pull request #16421 from agritheory/usregional
feat: US Regional Module with IRS 1099 reporting
2019-03-01 09:14:18 +05:30
scmmishra
471140c6d4 fix: Minor changes 2019-02-28 18:14:25 +05:30
scmmishra
f0a56b977a feat: Minor fixes to profile page 2019-02-28 18:11:46 +05:30
scmmishra
ab8fc8c2bf feat: Quizzes fixed 2019-02-28 16:42:37 +05:30
scmmishra
3726f8a7f6 feat: Added check for no content in topic meta 2019-02-28 16:33:53 +05:30
scmmishra
b793cc8e1e fix: Minor changes 2019-02-28 16:33:38 +05:30
Rohit Waghchaure
c21cda2790 Removed validation for group by voucher in general ledger 2019-02-28 16:20:45 +05:30
Frappe Bot
1fcae10258 Merge branch 'master' into develop 2019-02-28 10:20:48 +00:00
scmmishra
5e61b17cf8 fix: Routing after finishing a course topic 2019-02-28 15:43:33 +05:30
scmmishra
de5f71ae9e fix: Showing Topic Progress 2019-02-28 15:40:49 +05:30
Frappe Bot
5d414af86b Merge branch 'hotfix' 2019-02-28 10:08:08 +00:00
Frappe Bot
58135976dd bumped to version 11.1.12 2019-02-28 10:08:08 +00:00
scmmishra
b17d289bda fix: Course card progress 2019-02-28 15:21:43 +05:30
Rohit Waghchaure
ab4ff984c4 fix: scan barcode not adding the barcode value in the items table 2019-02-28 13:31:02 +05:30
Rushabh Mehta
57128e413c fix: task.js 2019-02-28 12:43:58 +05:30
Prateeksha Singh
de5f281145 Merge pull request #16803 from hrwX/route-fix
fix(route): Route for DocTypes and Reports
2019-02-28 11:55:13 +05:30
Himanshu Warekar
3315a9fafb fix routes 2019-02-28 11:51:36 +05:30
Himanshu Warekar
1cb695b7e9 fix route for Task and Tree of Procedure 2019-02-28 11:42:36 +05:30
rohitwaghchaure
1d41c1c2de Merge pull request #16787 from rohitwaghchaure/italian_more_fixes
fix: e-invoicing patch, patch to set country code in the address
2019-02-28 11:28:04 +05:30
rohitwaghchaure
75e17c664a Merge pull request #16797 from rohitwaghchaure/cost_update_not_working_for_price_list
fix: bom cost update is not working
2019-02-27 20:52:28 +05:30
Rohit Waghchaure
b48effebce fix: test case 2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670 fix: bom cost update is not working 2019-02-27 18:01:30 +05:30
scmmishra
56ad5da090 fix: Minor Changes 2019-02-27 15:32:36 +05:30
Rohit Waghchaure
74cfe57716 fix: e-invoicing patch, patch to set country code in the address 2019-02-27 14:38:36 +05:30
Anurag Mishra
a9a1552e32 refactor 2019-02-27 14:10:24 +05:30
scmmishra
e6735e418f fix: Content navigation 2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1 Fix: Content title fields 2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661 fix: Reloading bug on Content page 2019-02-27 12:24:17 +05:30
scmmishra
23880ae567 fix: Content fetching for articles and videos 2019-02-27 12:09:57 +05:30
scmmishra
628659e02a fix: Routing for course 2019-02-27 12:09:28 +05:30
Rushabh Mehta
fcd0556119 Merge pull request #16709 from rmehta/project-template
feat: Project Template
2019-02-27 09:22:12 +05:30
Rushabh Mehta
76f36f68d3 Merge pull request #16790 from crossxcell99/master
fix: call base class onload method
2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808 fix: call base clase onload method 2019-02-26 18:01:37 +01:00
scmmishra
90b503621b fix: Content Routing 2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287 fix: TopicMeta fixes 2019-02-26 17:11:01 +05:30
Sagar Vora
e0eafb1c2c Merge branch 'master' into develop 2019-02-26 17:08:59 +05:30
Sagar Vora
2ca1f135ef Merge branch 'hotfix' 2019-02-26 17:08:58 +05:30
Sagar Vora
5a14e46a1b bumped to version 11.1.11 2019-02-26 17:28:58 +05:50
Sagar Vora
311a9c79e3 fix: use node v10 for CI 2019-02-26 16:56:37 +05:30
scmmishra
03c4c635e0 fix: list title on CoursePage 2019-02-26 16:54:32 +05:30
scmmishra
95bb3c0ee9 Minor fixes 2019-02-26 16:49:58 +05:30
scmmishra
c011b08699 fix: Fixed UI and API for course page 2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77 fix: Fixed API and UI for topic card 2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849 fix: Minor UI fixes 2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb style: Minor code formatting 2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978 fix: Course Card shows topic list 2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f fix: Route for course page 2019-02-26 16:47:10 +05:30
scmmishra
3866dee3e1 feat: Corse doctype 2019-02-26 16:37:31 +05:30
Rushabh Mehta
45c252a240 fix(test): test_task.py 2019-02-26 16:18:46 +05:30
Nabin Hait
39c489bfdc Merge pull request #16781 from deepeshgarg007/summary
fix: Make company filter mandatory in sales person wise transaction summary
2019-02-26 16:00:51 +05:30
Nabin Hait
be5124fe10 Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing
fix: multiple e-invoicing issues for italy region
2019-02-26 15:52:56 +05:30
Rohit Waghchaure
0f98cb8b83 fix: multiple e-invoicing issues for italy region 2019-02-26 15:09:27 +05:30
Rushabh Mehta
b94c8b1c77 fix(tests): add test for bulk complete / cancellation of project 2019-02-26 14:30:38 +05:30
Rushabh Mehta
02a9ec33ed BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk 2019-02-26 14:30:38 +05:30
Rushabh Mehta
2d2d176e5c fix: linting 2019-02-26 14:30:38 +05:30
Rushabh Mehta
e9984672ce feat: Project Template 2019-02-26 14:30:38 +05:30
Rushabh Mehta
a77a8a42e5 fix(travis): nvm install 10 2019-02-26 14:30:00 +05:30
Saurabh
f32bae151f Merge pull request #16761 from saurabh6790/regional_fix
fix: file api
2019-02-26 13:59:10 +05:30
Saurabh
acf83791ab fix: file api 2019-02-26 13:58:18 +05:30
deepeshgarg007
d2d84e3c9d fix: Company filter fix 2019-02-26 11:52:22 +05:30
Sagar Vora
1ca2d47d35 fix: update node to version supported by Yarn (#16772) 2019-02-25 21:10:11 +05:30
Suraj Shetty
5636f924a9 fix: get mode of payment while selecting payment term in payment term template (#16765) 2019-02-25 12:43:34 +05:30
Nabin Hait
9990306399 fix: Consider only active BOMs while updating cost via BOM Update Tool (#16753) 2019-02-25 11:59:05 +05:30
Rushabh Mehta
e2de8e0fa5 fix: expense claim type (#16760) 2019-02-25 11:56:30 +05:30
Suraj Shetty
3ed3332c46 Merge pull request #16726 from deepeshgarg007/bom-item
fix: Removed duplicate fields from BOM Item
2019-02-22 10:26:29 +05:30
Suraj Shetty
2dadc1ef98 chore: Remove trailing whitespaces 2019-02-21 20:51:35 +05:30
deepeshgarg007
bf6b36a39b fix: Removed white spaces 2019-02-21 19:30:27 +05:30
deepeshgarg007
56b52d43e6 Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item 2019-02-21 18:30:02 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
Saurabh
539c77c591 Merge branch 'hotfix' 2019-02-21 18:25:28 +05:30
Saurabh
76cd402ca5 bumped to version 11.1.10 2019-02-21 18:55:28 +06:00
Saurabh
e5ff28a92c Merge pull request #16754 from deepeshgarg007/state_code
fix: State code issue fix
2019-02-21 18:21:24 +05:30
Nabin Hait
367d7c104e Merge pull request #16724 from rohitwaghchaure/user_progress_issue
fix: user progress issue
2019-02-21 18:13:52 +05:30
Saurabh
47738f9792 Merge pull request #16750 from nabinhait/cc-against-bs
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b Merge pull request #16745 from nabinhait/manage-returned-qty
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 18:11:37 +05:30
Nabin Hait
31f46b313c Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue
fix: not able to cancel maintenance visit
2019-02-21 18:10:46 +05:30
Nabin Hait
e328869b10 Merge pull request #16738 from deepeshgarg007/unique_tree_options
fix: Filter out unique values for tree options
2019-02-21 18:09:42 +05:30
Nabin Hait
e3b1b11bc5 Merge pull request #16740 from nabinhait/leave-calendar
fix: Calendar events for leaves considering user permissions
2019-02-21 18:08:19 +05:30
Saurabh
a05ccb76f4 Merge pull request #16748 from nabinhait/multi-company-serial-invoicing
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463 Merge pull request #16746 from deepeshgarg007/gross_profit
fix: Decimal point issue in gross profit print
2019-02-21 18:07:14 +05:30
deepeshgarg007
1915e15a9e fix: State code issue fix in regional module(Italy) 2019-02-21 17:55:57 +05:30
rohitwaghchaure
a49f59fcec Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:50:51 +05:30
Rohit Waghchaure
90691dc0d8 (Profit and Loss Statement, fix): for parent account value was showing as zero 2019-02-21 17:18:28 +05:30
Nabin Hait
b24caad789 fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings 2019-02-21 17:11:35 +05:30
Rohan Bansal
143973166f fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests 2019-02-21 15:57:06 +05:30
Suraj Shetty
463a3cf8cf Merge pull request #16725 from deepeshgarg007/item_dashboard
fix: Item name display issue fix in item dashboard
2019-02-21 14:42:38 +05:30
Nabin Hait
26972c954d fix: Validate serial no usage in invoice considering multi company transaction 2019-02-21 14:32:41 +05:30
deepeshgarg007
14ff6bfc32 fix: Decimal point issue in gross profit print 2019-02-21 12:08:32 +05:30
Nabin Hait
816a4655a0 fix: Consider returned qty while making invoice from DN / PR 2019-02-21 12:02:36 +05:30
Nabin Hait
40c15d2e74 fix: Calendar events for leaves considering user permissions 2019-02-20 18:55:38 +05:30
Saurabh
482ebd2c7c Merge branch 'master' into develop 2019-02-20 18:14:18 +05:30
Saurabh
bc3bdd77f6 Merge branch 'hotfix' 2019-02-20 18:14:17 +05:30
Saurabh
ada93e5d77 bumped to version 11.1.9 2019-02-20 18:44:17 +06:00
deepeshgarg007
0d64d622e5 fix: filter only unique values for tree options 2019-02-20 17:55:14 +05:30
rohitwaghchaure
485bd93dae Merge pull request #16737 from saurabh6790/indentation_fixes
fix: reload report doc and indentation fixes
2019-02-20 17:40:50 +05:30
rohitwaghchaure
c18e925d61 fix: Moved regional methods from controller to hooks (#16736) 2019-02-20 17:13:15 +05:30
Saurabh
9fcfc63f77 fix: reload report doc and indentation fixes 2019-02-20 17:04:18 +05:30
rohitwaghchaure
ef3f864123 fix: not able to submit purchase order (#16735) 2019-02-20 15:47:06 +05:30
rohitwaghchaure
e141865c43 Merge pull request #16722 from rohitwaghchaure/stop_button_not_working
fix: stop button not working in material request
2019-02-20 12:30:26 +05:30
Sagar Vora
eba76c99a3 Merge branch 'master' into develop 2019-02-20 12:11:25 +05:30
Sagar Vora
c09ffe1308 Merge branch 'hotfix' 2019-02-20 12:11:25 +05:30
Sagar Vora
d48393541d bumped to version 11.1.8 2019-02-20 12:31:25 +05:50
Gaurav Naik
3bf0acbac6 fix(regional,italy): renamed validate hook for address (#16732) 2019-02-20 12:08:53 +05:30
Rohit Waghchaure
7e02e1c3cd fix: not able to cancel maintenance visit 2019-02-19 22:53:31 +05:30
deepeshgarg007
1b04534095 fix: Removed duplicate fields from BOM Item 2019-02-19 21:36:12 +05:30
deepeshgarg007
942c894f93 fix: fetch item name in item dashboard 2019-02-19 19:51:23 +05:30
Rohit Waghchaure
f4049f9dfd fix: user progress issue 2019-02-19 19:46:14 +05:30
Rohit Waghchaure
389cd6ad63 fix: stop button not working in material request 2019-02-19 19:18:07 +05:30
scmmishra
62968b318f wip 2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Sagar Vora
2b7ce3dc71 Merge branch 'hotfix' 2019-02-19 17:54:14 +05:30
Sagar Vora
f5c511c193 bumped to version 11.1.7 2019-02-19 18:14:14 +05:50
Nabin Hait
2c23f98b65 Merge pull request #16721 from nabinhait/ar-ap-fix
fix: AR/AP report based on account type
2019-02-19 17:45:30 +05:30
Nabin Hait
06e6e87e3b Merge pull request #16720 from gaurav-naik/italy-state-codes
fix(regional,italy): added state code on address, updated patch
2019-02-19 17:44:49 +05:30
Gaurav
3f046136d4 fix(regional,italy): added state code on address, updated patch
moved state codes to init, rewired patch
added logic to autoset state code on address validate
handled multiple names for Italy
refactored validate_address_italy to validate_address
2019-02-19 17:28:36 +05:30
Nabin Hait
e4f73929c4 fix: AR/AP report based on account type 2019-02-19 17:11:50 +05:30
scmmishra
cb8ef96f6b chore (css): Switched to frappe navbar 2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36 fix (css): Removed container class 2019-02-19 17:01:31 +05:30
Nabin Hait
ff6d2692d3 Merge pull request #16663 from netchampfaris/fix-item-variant-settings-barcodes
fix: Validate invalid fields in Item Variant Settings
2019-02-19 15:07:55 +05:30
Nabin Hait
8e9d947527 Merge branch 'hotfix' into fix-item-variant-settings-barcodes 2019-02-19 15:07:46 +05:30
Nabin Hait
21706894af Merge pull request #16705 from deepeshgarg007/pos-precision
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
2c65ef0286 Merge pull request #16710 from deepeshgarg007/purchase-qty-fix
Received Qty Label rename to accepted qty in purchase invoice
2019-02-19 15:06:18 +05:30
Nabin Hait
818ead4041 Merge branch 'hotfix' into purchase-qty-fix 2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978 Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824 Merge pull request #16716 from deepeshgarg007/precision-fix
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
rohitwaghchaure
e938306e7d Merge pull request #16598 from gaurav-naik/italy-hotfix-new
feat(regional): Italian Localization and E-Invoicing export
2019-02-19 14:56:07 +05:30
Gaurav
2670ad7eb2 mod(regional,italy): adjusted calculation logic for charges
validation for missing code on mode of payment
UOM from settings
Replace str with cstr
2019-02-19 13:15:25 +05:30
scmmishra
765529241e [Major][Breaking] More changes 2019-02-19 13:06:33 +05:30
scmmishra
da39da627c [Major][Breaking] Server side changes to handle Topic Layer
- Moved `get_course_progress` to CourseEnrollment class.
- Added Topic context to progress functions in lms.py
- Create user on creation of a student
2019-02-19 13:06:33 +05:30
scmmishra
cc7290b7af [Major][Breaking] Student Class 2019-02-19 13:06:33 +05:30
scmmishra
766f68a20a [Major][Breaking] Modified lms.py and utils 2019-02-19 13:06:33 +05:30
scmmishra
e7d52c594b [Major][Breaking] Program Enrollment Creates Course enrollment 2019-02-19 13:06:33 +05:30
scmmishra
1253061055 [Major][Breaking] Modified Course Doctype, added Topic based functions 2019-02-19 13:06:33 +05:30
scmmishra
42f50fd82c [Major][Breaking] Added Topic Layer in Course 2019-02-19 13:06:33 +05:30
scmmishra
699f7c6fee Minor changes 2019-02-19 13:06:33 +05:30
scmmishra
42f3c51ff7 Removed Content Doctype 2019-02-19 13:06:33 +05:30
scmmishra
6663ca1d7f Adding Test Utils 2019-02-19 13:06:33 +05:30
scmmishra
c51f738b03 Refactored student creation 2019-02-19 13:06:33 +05:30
scmmishra
689500d081 Minor UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0 UI Improvements: Added Custom Navbar 2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d Added quiz card on profile page 2019-02-19 13:06:33 +05:30
scmmishra
4d10229cef Quiz Progress and Minor fixes 2019-02-19 13:06:33 +05:30
scmmishra
c84a318591 Student and User link for LMS added 2019-02-19 13:06:33 +05:30
scmmishra
b3154efa84 UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d More Improvements 2019-02-19 13:06:33 +05:30
scmmishra
02420bd4ba Client side improvements 2019-02-19 13:06:33 +05:30
scmmishra
edc54cd5f6 Minor improvements for CardList.vue 2019-02-19 13:06:33 +05:30
scmmishra
2955851867 Built Student Profile Page 2019-02-19 13:06:33 +05:30
scmmishra
308f235859 Added Profile page 2019-02-19 13:06:33 +05:30
scmmishra
201fec3101 Minor Improvements 2019-02-19 13:06:33 +05:30
scmmishra
97c994f394 create course enrollment if not already enrolled for a program 2019-02-19 13:06:33 +05:30
scmmishra
affbfe7d0c Added get_program_meta 2019-02-19 13:06:33 +05:30
scmmishra
cbb7c7ff23 ui fixes 2019-02-19 13:06:33 +05:30
scmmishra
cc755f6204 Doctype Changes for Beta Release 2019-02-19 13:06:33 +05:30
scmmishra
788ffbd5b6 Minor improvements 2019-02-19 13:06:33 +05:30
scmmishra
9229f4fc92 UI fixes 2019-02-19 13:06:33 +05:30
scmmishra
082e3c94ef Minor Fixes: Student Enrollment 2019-02-19 13:06:32 +05:30
scmmishra
fdbabde80a UI fixes for course card 2019-02-19 13:06:32 +05:30
scmmishra
be7fadc521 Renamed CoursePage to ContentPage 2019-02-19 13:06:32 +05:30
scmmishra
d93cec374d Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
a592f70d4a Refactored Course Progression Logic 2019-02-19 13:06:32 +05:30
scmmishra
1192529698 Refactored lms.py, modified utils 2019-02-19 13:06:32 +05:30
scmmishra
8951c165f0 Fixed major bugs 2019-02-19 13:06:32 +05:30
scmmishra
53c2d5db63 Refactored lms store 2019-02-19 13:06:32 +05:30
scmmishra
0a5c7a6b46 Removed unnecessary prints 2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c Refactored server side code 2019-02-19 13:06:32 +05:30
scmmishra
19e12ac3d6 Minor changes to quiz doctype 2019-02-19 13:06:32 +05:30
scmmishra
80ecc56cbe Using lms.call across the Vue app 2019-02-19 13:06:32 +05:30
scmmishra
0a4902f8b5 UI Changes 2019-02-19 13:06:32 +05:30
scmmishra
c5a1226e93 Refactored State management store 2019-02-19 13:06:32 +05:30
scmmishra
85c2feec0d Added ListPage and other UI improvements 2019-02-19 13:06:32 +05:30
scmmishra
efb01c3f75 Renamed components 2019-02-19 13:06:32 +05:30
scmmishra
2596ea0816 Renamed Vue Files 2019-02-19 13:06:32 +05:30
scmmishra
0225642459 Renamed Pages 2019-02-19 13:06:32 +05:30
scmmishra
8ff1028665 Renamed AcademyRoot to lmsRoot 2019-02-19 13:06:32 +05:30
scmmishra
1fbe2d4b2b Renamed academy to lms (Client Side) 2019-02-19 13:06:32 +05:30
scmmishra
35bf561a6f Renamed academy to lms on server side 2019-02-19 13:06:32 +05:30
scmmishra
44921a3ee9 Renamed default element for Vue to mount on 2019-02-19 13:06:32 +05:30
scmmishra
91bbe776c1 Modified academy.call to point to erpnext.www.lms 2019-02-19 13:06:32 +05:30
scmmishra
af30b771f0 Renamed academy to lms on server side 2019-02-19 13:06:32 +05:30
scmmishra
f9f7318d3f Deleted Old LMS Content 2019-02-19 13:06:32 +05:30
scmmishra
d7c993f028 Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717 Fixed course and content page 2019-02-19 13:06:32 +05:30
scmmishra
db9c8b795a Functions now have a login context 2019-02-19 13:06:32 +05:30
scmmishra
708756ed40 Added academy namespace 2019-02-19 13:06:32 +05:30
scmmishra
892b0c23fc Added class functions 2019-02-19 13:06:31 +05:30
scmmishra
cc166c01eb Improved Client implementation 2019-02-19 13:06:31 +05:30
scmmishra
c1b1a5ec37 Permission Changes 2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37 More Bug fixes UI and Permissions 2019-02-19 13:06:31 +05:30
scmmishra
05e07b44b1 Removed unused utils functions 2019-02-19 13:06:31 +05:30
scmmishra
734a746687 Minor DocType changes 2019-02-19 13:06:31 +05:30
scmmishra
b409f7a388 Minor UI Changes and Fixes 2019-02-19 13:06:31 +05:30
scmmishra
850dfd0358 Set appropriate permissions 2019-02-19 13:06:31 +05:30
scmmishra
9f316a3b30 Permission changes 2019-02-19 13:06:31 +05:30
scmmishra
86897b3cc8 UI: Kinda fixed "Completed" button render issue 2019-02-19 13:06:31 +05:30
scmmishra
5611bf4e29 Minor change 2019-02-19 13:06:31 +05:30
scmmishra
25e42baeaf Course completion logic complete 2019-02-19 13:06:31 +05:30
scmmishra
a920bca044 Minor UI fixes 2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06 Added methods to saving Quiz attempts 2019-02-19 13:06:31 +05:30
scmmishra
76222f7acc Modified add-activity, no duplicates will be saved now 2019-02-19 13:06:31 +05:30
scmmishra
a3afe2a998 Sending session data explicitly 2019-02-19 13:06:31 +05:30
scmmishra
cfce153ed4 Minor UI changes 2019-02-19 13:06:31 +05:30
scmmishra
1f4835b3b4 Added Video UI 2019-02-19 13:06:31 +05:30
scmmishra
6de9cbb52d Solved minor issue (Last activity not being saved) 2019-02-19 13:06:31 +05:30
scmmishra
1a04f774d7 LMS: Saving Course Activity 2019-02-19 13:06:31 +05:30
scmmishra
7d5e218155 Modified Quiz Evaluation 2019-02-19 13:06:31 +05:30
scmmishra
ed5892c7a5 UI: Components rendered based on student progress 2019-02-19 13:06:31 +05:30
scmmishra
a054655442 Updated state functions for session management 2019-02-19 13:06:31 +05:30
scmmishra
90722e3a9b Fixed Permissions for LMS User 2019-02-19 13:06:31 +05:30
scmmishra
73a31ec7bb Added functions to query Student enrollments 2019-02-19 13:06:31 +05:30
scmmishra
91aa0e07c8 Added class function for student enrollment 2019-02-19 13:06:31 +05:30
scmmishra
734d3e084c Set home page for LMS User 2019-02-19 13:06:31 +05:30
scmmishra
8b8db54ef4 Added enroll function 2019-02-19 13:06:30 +05:30
scmmishra
15012c08a4 UI Fixes 2019-02-19 13:06:30 +05:30
scmmishra
72fd3bc0ea Removed unnecessary watcher 2019-02-19 13:06:30 +05:30
scmmishra
3c412f56c9 UI: Changes to AcademyTopSection 2019-02-19 13:06:30 +05:30
scmmishra
bcafe84bb6 Adding session management to client 2019-02-19 13:06:30 +05:30
scmmishra
7a19b63837 Minor changes 2019-02-19 13:06:30 +05:30
scmmishra
e30f2eb297 Re-factored CourseCard UI 2019-02-19 13:06:30 +05:30
scmmishra
6678f5b88e Added custom store for state management 2019-02-19 13:06:30 +05:30
scmmishra
ef9a75e50d Removed unnecessary print statements 2019-02-19 13:06:30 +05:30
scmmishra
cd0cab78a5 Quiz UI Working 2019-02-19 13:06:30 +05:30
scmmishra
f9e8e4e2d3 Modified question.py 2019-02-19 13:06:30 +05:30
scmmishra
f7029f084c Quiz is now submittable 2019-02-19 13:06:30 +05:30
scmmishra
cfc35f4424 Quiz: Save responses as an object 2019-02-19 13:06:30 +05:30
scmmishra
d2e040b6f1 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
160d8b0914 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
d87ca178d8 UI for Quiz 2019-02-19 13:06:30 +05:30
scmmishra
374184414b Added quiz functions 2019-02-19 13:06:30 +05:30
scmmishra
7a59f9501e UI for Content 2019-02-19 13:06:30 +05:30
scmmishra
bcafbea481 UI for Course page 2019-02-19 13:06:30 +05:30
scmmishra
b43ab3317c UI for home page and program page 2019-02-19 13:06:30 +05:30
scmmishra
9c642ace52 Helper Functions for VueJS 2019-02-19 13:06:30 +05:30
scmmishra
84297fa349 Starting with VueJS 2019-02-19 13:06:30 +05:30
scmmishra
1778b59efa Started with Vue 2019-02-19 13:06:30 +05:30
scmmishra
9456c82536 Getting started with Vue 2019-02-19 13:06:29 +05:30
scmmishra
5e758aea00 Minor Changes 2019-02-19 13:06:29 +05:30
scmmishra
75ad128912 Added LMS Settings 2019-02-19 13:06:29 +05:30
scmmishra
9e80f32e2a Minor Changes 2019-02-19 13:06:29 +05:30
scmmishra
1e1f1ad186 LMS: Course Completion Status Working 2019-02-19 13:06:29 +05:30
scmmishra
a8703d4036 LMS: Changes to Course Activity Doctype, Course Activity Tracking Works
Co-authored-by: Sahil <sahilkhan28297@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
57c77e452b LMS: Course Activity
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
7409fe6438 LMS: Quiz Eval and Max Attempts Check
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
3574ac3f5e quiz_activity: add quiz activity
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
3bf71a2df6 Quiz Logic 2019-02-19 13:06:29 +05:30
scmmishra
d133e8229b Quiz Evaluation Logic 2019-02-19 13:06:29 +05:30
scmmishra
4f439ec4dd Quiz eval utils 2019-02-19 13:06:29 +05:30
scmmishra
0d4135ec2b LMS: Fixed view for Quiz
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
91bbe10495 LMS: More changes to the web view 2019-02-19 13:06:29 +05:30
scmmishra
5569cbf82c Revert "LMS: Fixed views for article and video"
This reverts commit 9b7585405f7e25dcdcba4e131066d6b57a1d8899.
2019-02-19 13:06:29 +05:30
scmmishra
1e10fc43f4 LMS: Fixed views for article and video 2019-02-19 13:06:29 +05:30
scmmishra
590227b107 LMS: Fixed views for article and video 2019-02-19 13:06:29 +05:30
scmmishra
18baff5fec Minor changes to question doctype
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
scmmishra
541a522b26 LMS:Added class methods for course, program and student doctypes
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:29 +05:30
Chinmay Pai
1869419bdc lms: refactor entire course model
each course item now has its own doctype.

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
685584bf56 Quiz: Quiz now displays correctly on the portal
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
3757a4eab8 Modified program and index view
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
fa2db3c41b LMS: Added functions to get LMS contents
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:06:28 +05:30
scmmishra
82df4378de Changes to get_quiz function 2019-02-19 13:06:28 +05:30
scmmishra
3cbb9795a4 Minor changes to doctypes 2019-02-19 13:06:28 +05:30
scmmishra
f9cef33e41 Dashboard changes for student and program 2019-02-19 13:06:28 +05:30
scmmishra
5311e3898c General Changes 2019-02-19 13:06:28 +05:30
scmmishra
31cbe3c0dc Added function to retrieve quiz data as JSON 2019-02-19 13:05:23 +05:30
scmmishra
d1650b9f63 Modified Question doctype for a better design 2019-02-19 13:05:23 +05:30
scmmishra
1fc45c547b Added Course Enrollment doctype 2019-02-19 13:05:23 +05:30
scmmishra
06d175a2bd Added Quiz Activity doctype 2019-02-19 13:05:23 +05:30
scmmishra
e7308125b4 Replaced Student Course Activity with Course Activity 2019-02-19 13:05:23 +05:30
scmmishra
17294e703e Course Activity linked to Student ID 2019-02-19 13:05:23 +05:30
scmmishra
38c1baf719 Templates: modified routing logic, added data attributes in template
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
9335593b56 LMS: JS Script to send quiz and activity data 2019-02-19 13:05:23 +05:30
scmmishra
4ae11f4d74 LMS: added python functions to evaulate quiz and save student activity
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
eab0b833a1 Modified Student Course Activity Doctype
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
6660a675f1 templates: add templates for LMS content
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
de36e13db7 modified doctypes for lms
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
836a4b5e54 lms: add activity child table and create frontend
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
b3b003f518 course_activity: create doctype for tracking student course activity
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
55e7c1a866 api: create user account for student
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
43da645be0 Added Web Academy Applicant doctype 2019-02-19 13:05:23 +05:30
scmmishra
4e208e99bc Added Student Course Acitivity doctype 2019-02-19 13:05:23 +05:30
scmmishra
8c41abc2df Modified education menu items 2019-02-19 13:03:59 +05:30
scmmishra
84a49d5ea7 Modified Content doctype, added question child table for quiz 2019-02-19 13:03:59 +05:30
scmmishra
f05837a895 Updated Content Doctype 2019-02-19 13:03:59 +05:30
scmmishra
abd1d209fb Added Content Doctype 2019-02-19 13:03:59 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Gaurav
a4aa80fe05 feature(regional): Italian Localization
Added setup.py for italy under regional
Included fiscal regimes, tax exemption reasons and custom fields

Issue #16259
2019-02-19 10:39:10 +05:30
Jigar Tarpara
1ac17ec1c4 Add credit month in validation 2019-02-19 10:21:01 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad fix: multi-uom not working for the pricing rule rate 2019-02-18 20:07:44 +05:30
Nabin Hait
750fe6eaea fix: get item rate in bom 2019-02-18 18:56:08 +05:30
rohitwaghchaure
982ed555d2 Merge pull request #16708 from rohitwaghchaure/allow_to_make_sle_if_jc_is_in_draft
fix: Allow to make material request from draft job card
2019-02-18 18:46:11 +05:30
deepeshgarg007
9a19e06856 fix: Change Received qty to accepted qty and validation for indicators 2019-02-18 18:42:15 +05:30
Rohit Waghchaure
99e7362006 fix: Allow to make material request from draft job card 2019-02-18 18:26:50 +05:30
deepeshgarg007
48a7262fae fix: Precision issue in POS payment 2019-02-18 15:05:36 +05:30
Anurag Mishra
879e5fd8bb remove print and codacy 2019-02-18 14:43:55 +05:30
Anurag Mishra
42a106c7ba Auditors print formats 2019-02-18 14:35:33 +05:30
rohitwaghchaure
1bcbe9069b Merge pull request #16610 from jay-parikh/hotfix
fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile
2019-02-18 12:43:57 +05:30
Rushabh Mehta
20db65ef77 Merge pull request #16694 from rmehta/refactor-comments
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-18 12:05:35 +05:30
Anurag Mishra
61f981ae05 Changes Requested 2019-02-18 11:43:32 +05:30
Rushabh Mehta
f3b33f3ab2 Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features
feat(marketplace): seller profile page
2019-02-18 11:24:01 +05:30
Rushabh Mehta
1a6668ef3c Merge pull request #16633 from pratu16x7/explore-2.0
feat(modules): Add getting started and help desk, merge settings
2019-02-18 11:20:14 +05:30
Rushabh Mehta
c8e05206cc Merge pull request #16695 from surajshetty3416/remove-unwanted-barcode-field
fix: Remove unwanted barcode field
2019-02-18 11:18:53 +05:30
Rushabh Mehta
39c106dd05 fix(test): rename test in test_customer 2019-02-18 11:16:59 +05:30
Suraj Shetty
053d6a2ca1 Move reload doc before get query 2019-02-17 11:24:51 +05:30
Suraj Shetty
3a2f342ac1 Ignore duplicate entry 2019-02-16 21:09:24 +05:30
Suraj Shetty
1399fbe986 Move patch 2019-02-16 21:02:34 +05:30
Suraj Shetty
8cbe824c5b Rerun item_barcode_chidtable_migrate patch 2019-02-16 17:54:15 +05:30
Suraj Shetty
cc0222a28a Remove unwanted barcode field from item 2019-02-16 17:53:23 +05:30
Rushabh Mehta
7bb9eae685 Merge pull request #16541 from alyf-de/develop
feat(regional): Germany module with address template
2019-02-16 10:54:28 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Frappe Bot
58dda68430 Merge branch 'hotfix' 2019-02-15 10:22:32 +00:00
Frappe Bot
acf26c8569 bumped to version 11.1.6 2019-02-15 10:22:32 +00:00
Faris Ansari
8a01342e48 fix: Remove comment 2019-02-15 15:14:38 +05:30
Nabin Hait
09a4df74f0 Merge pull request #16645 from nabinhait/tds-fix
fix: Ignore tds account while creating tax withholding category
2019-02-15 14:53:30 +05:30
Nabin Hait
eb0627356b Merge pull request #16650 from nabinhait/general-ledger-fix
fix: show values in account/party currency based in actual entry, no conversion
2019-02-15 14:53:12 +05:30
Nabin Hait
b5c249583a Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux
fix: Barcode scanning UX
2019-02-15 14:52:42 +05:30
Nabin Hait
b819f104e6 Merge pull request #16653 from nabinhait/item-variants
fix: Enqueued item variants updation if there are more than 30 variants
2019-02-15 14:51:14 +05:30
Nabin Hait
c45962e3ef Merge pull request #16675 from deepeshgarg007/purchase-fix
fix: Purchase order item description fix
2019-02-15 14:50:38 +05:30
Nabin Hait
aa80a223d8 Merge pull request #16674 from deepeshgarg007/address-rep-fix
fix: Address and contact report
2019-02-15 14:26:16 +05:30
Nabin Hait
8788a5c712 Merge pull request #16676 from nabinhait/get-item-details
fix: get item details
2019-02-15 14:24:46 +05:30
Nabin Hait
b1cbe221b7 Merge pull request #16677 from nabinhait/total-qty-patch-fix
fix: Consider parenttype while updating total qty in transactions
2019-02-15 14:24:30 +05:30
Nabin Hait
a0c9c7501b Update update_total_qty_field.py 2019-02-15 14:24:08 +05:30
Nabin Hait
9d85876086 Merge pull request #16679 from nabinhait/get_oustanding
Get outstanding invoices
2019-02-15 14:23:07 +05:30
Tropicalrambler
3a88bc43dc fix: typo in salary register report field name (#16670)
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled.  The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
2019-02-15 13:40:44 +05:30
Sagar Vora
379e6a4635 Merge branch 'hotfix' into address-rep-fix 2019-02-15 13:08:42 +05:30
Nabin Hait
4df7679c65 fix: Get outstanding invoices 2019-02-15 13:08:04 +05:30
Sagar Vora
ebdd8a9710 Merge branch 'hotfix' into purchase-fix 2019-02-15 13:04:32 +05:30
Sagar Vora
921f468950 Merge branch 'hotfix' into get-item-details 2019-02-15 13:03:04 +05:30
Nabin Hait
6f7a4d94ce fix: Consider parenttype while updating total qty in transactions 2019-02-14 19:34:43 +05:30
Nabin Hait
f66c6874ca Merge pull request #16652 from nabinhait/work-order-fix
fix: Make work order from production plan considering already ordered qty
2019-02-14 18:50:30 +05:30
Nabin Hait
54f8ed1282 Merge branch 'hotfix' into item-variants 2019-02-14 18:50:11 +05:30
Nabin Hait
c3698e458f Merge pull request #16666 from nabinhait/deferred-revenue-fix
fix: errors in deferred revenue booking
2019-02-14 18:49:01 +05:30
Nabin Hait
1c6a1dd5c0 Merge branch 'hotfix' into general-ledger-fix 2019-02-14 18:37:40 +05:30
Nabin Hait
0d1ccc357f fix: get item details 2019-02-14 18:30:10 +05:30
deepeshgarg007
867ca63750 fix: Purchase order item description fix 2019-02-14 18:10:47 +05:30
Deepesh Garg
20008946a3 Merge branch 'hotfix' into address-rep-fix 2019-02-14 17:37:41 +05:30
Deepesh Garg
4902f7b2a0 fix: Show tasks in timesheet with status as Closed (#16660) 2019-02-14 17:32:52 +05:30
deepeshgarg007
34f4f24e21 fix: Address and contact report 2019-02-14 17:26:49 +05:30
Nabin Hait
29fcb14c42 fix: errors in deferred revenue booking 2019-02-13 17:18:12 +05:30
Deepesh Garg
4d1bc0ca85 fix: Add total row in analytics report (#16648) 2019-02-13 16:58:46 +05:30
Anurag Mishra
4f0fd38209 refractor 2019-02-13 16:46:05 +05:30
Faris Ansari
a748ca69e7 fix: Validate invalid fields in Item Variant Settings
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
2019-02-13 13:02:39 +05:30
rohitwaghchaure
a0aaeafae8 Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg
fix: validation message for work order
2019-02-13 09:49:25 +05:30
Faris Ansari
795102125c Merge branch 'hotfix' into fix-barcode-scanning-ux 2019-02-12 18:31:06 +05:30
Nabin Hait
db527bfb24 fix: Enqueued item variants updation if there are more than 30 variants 2019-02-12 18:30:00 +05:30
Nabin Hait
1a3c27bbea fix: Make work order from production plan considering already ordered qty 2019-02-12 17:38:37 +05:30
Faris Ansari
5631ffca68 fix: Barcode scanning UX 2019-02-12 17:12:48 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50 fix: show values in account/party currency based in actual entry, no conversion 2019-02-12 16:41:20 +05:30
Sagar Vora
e11f2c0107 Merge branch 'hotfix' 2019-02-12 16:34:29 +05:30
Sagar Vora
6837ae3377 bumped to version 11.1.5 2019-02-12 16:54:29 +05:50
karthikeyan5
4324dc6ea8 fix(marketplace): fixing hubmarket server specific error 2019-02-12 15:12:23 +05:30
karthikeyan5
4df6003bd9 feat(marketplace): seller profile page 2019-02-12 15:12:23 +05:30
karthikeyan5
2894f7935a feat(marketplace): featured Items for sellers 2019-02-12 15:12:23 +05:30
karthikeyan5
88baf53cc1 feat(marketplace): navigation link to seller profile from item page 2019-02-12 15:12:23 +05:30
Nabin Hait
fdefbdb23b Merge pull request #16609 from nabinhait/multipel_fixes
Multiple fixes
2019-02-12 13:56:06 +05:30
Prateeksha Singh
426468183f fix(getting_started): main domain specific masters 2019-02-12 13:08:21 +05:30
Nabin Hait
c46d995480 Merge pull request #16628 from Zlash65/fix-noti-patch
fix: Notification Control delete
2019-02-12 13:04:45 +05:30
Nabin Hait
e6abee4bd5 Merge pull request #16643 from Zlash65/field-fix
fix: Fieldtype and Fetch From fixes
2019-02-12 13:04:00 +05:30
Nabin Hait
ca536efe7b Merge pull request #16640 from nabinhait/pur_reg_fix
fix: show project even if PI is directly created
2019-02-12 13:01:18 +05:30
Deepesh Garg
da7c20e474 fix: Validate task dates in project (#16586)
* fix: Validate task dates in project

* fix: Test case fix and validation only if date exists

* fix: Added dates in error messages
2019-02-12 12:55:50 +05:30
Rohit Waghchaure
e0412a177c fix: validation message for work order 2019-02-12 11:47:16 +05:30
Zlash65
fc88029d7d fix: fix item field for clinical procedure template 2019-02-12 11:38:27 +05:30
Zlash65
b614fb1d45 fix: make finance book field as link field and rectify fetch_from 2019-02-12 11:30:58 +05:30
Nabin Hait
afef9c1cc7 fix: Ignore tds account while creating tax withholding category 2019-02-12 11:28:20 +05:30
Zlash65
fd3998cfc9 fix: make branch as link field 2019-02-12 11:27:23 +05:30
Prateeksha Singh
9adad2988d feat(getting_started): Minimum requirements to setup 2019-02-12 08:37:53 +05:30
Prateeksha Singh
08a6de6b41 fix(modules): shorten descriptions 2019-02-12 07:41:52 +05:30
Nabin Hait
ab50211e18 fix: show project even if PI is directly created 2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report 2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc fix: codacy 2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850 Merge branch 'hotfix' into gross-and-net-profit-report 2019-02-11 16:00:28 +05:30
sahil28297
1a7e438fb2 fix(pstch): allow duplicate entries (#16632) 2019-02-11 15:53:04 +05:30
Rohan Bansal
d635f722fc fix(stock_balance): Make balance qty and value columns more visible 2019-02-11 15:22:01 +05:30
Prateeksha Singh
9d4a183074 fix(modules): Merge Settings into one, Setup --> Settings 2019-02-11 15:14:50 +05:30
rohitwaghchaure
d95c8cfac3 Merge pull request #16621 from netchampfaris/fix-warehouse-currency
fix: Set company_currency for Warehouse Tree
2019-02-11 14:58:02 +05:30
Prateeksha Singh
01a045a488 feat(modules): Add getting started and help desk 2019-02-11 14:01:04 +05:30
Anurag Mishra
a032f0528e new report gross-and-net-profit-report 2019-02-11 13:12:44 +05:30
Zlash65
a206f06af9 delete notification control's docctype entry 2019-02-11 12:01:01 +05:30
Nabin Hait
bb6438af5a Merge pull request #16537 from nabinhait/stock-balance-fix
fix: Fixed error on stock balance report
2019-02-11 11:00:01 +05:30
Rushabh Mehta
c8018bdeb1 fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891 2019-02-09 21:10:29 +05:30
Faris Ansari
453964728d fix: Set company_currency for Warehouse Tree 2019-02-09 20:27:42 +05:30
Nabin Hait
17e0513270 fix: message if stock reco is enqueued 2019-02-08 16:56:26 +05:30
Nabin Hait
8d4bb3e327 fix: backflush only if transferred item is present in work order 2019-02-08 16:56:26 +05:30
Nabin Hait
450fe309d6 fix: allow updating title of material request 2019-02-08 16:56:26 +05:30
Nabin Hait
e3b0f4f9f6 fix: removed account type filter on employee advance account 2019-02-08 16:56:26 +05:30
Nabin Hait
27af6b377f fix: defered accounting fixes 2019-02-08 16:56:26 +05:30
Jay Parikh
1906f6da3a Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588 2019-02-08 11:13:09 +00:00
Aditya Hase
1bfdceaf7e Merge pull request #16605 from adityahase/fix-py3
fix(py3): Python 3 compatibility fixes
2019-02-08 12:51:34 +05:30
Aditya Hase
e53a6a6723 Merge branch 'develop' into fix-py3 2019-02-08 12:51:05 +05:30
Nabin Hait
208ce5dcea fix: removed module type for learn 2019-02-08 12:25:30 +05:30
Aditya Hase
13808b4cc9 fix(py3): Convert to float before comparison 2019-02-08 12:03:25 +05:30
Aditya Hase
2a3c39f38a fix(py3): Convert dict.values() to list for indexing 2019-02-08 12:02:57 +05:30
Aditya Hase
46d7456782 fix(py3): Convert list to filter for indexing 2019-02-08 12:02:14 +05:30
Prateeksha Singh
6d541605ca Merge pull request #16603 from pratu16x7/explore-2.0
fix(modules): add ERPNext settings module
2019-02-08 08:10:08 +05:30
Prateeksha Singh
e31cdb5b85 fix(modules): add ERPNext settings module 2019-02-08 08:06:23 +05:30
Aditya Hase
c3f669d526 Merge pull request #16601 from frappe/py3-travis-fix
fix(py3): Python 3 compatibility fixes
2019-02-07 23:35:20 +05:30
Aditya Hase
a86a569787 fix(py3): Convert dict.values() to list for indexing 2019-02-07 22:21:06 +05:30
Aditya Hase
3e954734d0 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
6e1bb60b58 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
e1f867f29f fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
d9ce732d3e fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
a9f20d801d Merge pull request #16599 from adityahase/python3-fix
fix(py3): Use six.text_type instead of unicode
2019-02-07 22:20:41 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Aditya Hase
0b1dc32fcb Merge pull request #16597 from adityahase/python3-fix
fix(py3): Use range instead of xrange
2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86 fix(py3): Use range instead of xrange 2019-02-07 18:10:30 +05:30
Rushabh Mehta
665ee4ac33 Merge pull request #16480 from pratu16x7/explore-2.0
feat(explore_page): rearrange links
2019-02-07 12:20:27 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
9b14d46c1d purge(modules): remove old desktop icon configs 2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08 config(modules): Rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
b5eb16faeb feat(config): add some onboarding cues 2019-02-07 09:58:22 +05:30
Prateeksha Singh
ce27cffaad refactor(desk_icon): Remove reference and patches to Desktop Icon 2019-02-07 09:58:21 +05:30
Prateeksha Singh
2c14704398 feat(modules): Add Retail module, update others 2019-02-07 09:57:10 +05:30
Prateeksha Singh
7cd6ebeb6d feat(explore_page): rearrange links 2019-02-07 09:57:10 +05:30
Raffael Meyer
ff878c0c1d fix formatting and names 2019-02-07 03:28:27 +01:00
Faris Ansari
504f317434 fix: BOM Stock Calculated Report (#16585)
- Cast null values to 0 to avoid mathematic errors
2019-02-07 07:15:38 +05:30
Faris Ansari
8ae5dbcac8 fix: Set barcode in Item row after scanning barcode (#16591) 2019-02-07 07:09:49 +05:30
Himanshu
088886e082 Remove illegal character after break (#16589) 2019-02-07 07:09:20 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Sagar Vora
76120309e3 Merge branch 'hotfix' 2019-02-05 18:40:38 +05:30
Sagar Vora
8aa34a0ce0 bumped to version 11.1.4 2019-02-05 19:00:38 +05:50
Prateeksha Singh
34df5d27a1 Merge pull request #16518 from karthikeyan5/staging-marketplace-features
fix(marketplace): bug in filtering menu_items
2019-02-05 18:09:57 +05:30
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
56bff95e15 Merge pull request #16571 from Thunderbottom/purchase-invoice-fix
fix(purchase_invoice): fix undefined variable
2019-02-05 10:26:41 +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
Nabin Hait
690b83076d Merge pull request #16377 from SaiFi0102/Item-Tax-Template-V12
feat: Tax Category and Item Tax Template (v12)
2019-02-02 13:51:55 +05:30
rohitwaghchaure
752f2f1805 Merge pull request #16547 from rohitwaghchaure/project_status_email_fix
fix: check open status projects for project status update
2019-02-02 13:06:29 +05:30
Saif Ur Rehman
590491779a Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
# Conflicts:
#	erpnext/stock/doctype/item/item.py
2019-02-02 02:49:04 +05:00
Saif Ur Rehman
00aaa48779 test(Item): test_item_defaults 2019-02-02 02:43:44 +05:00
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
Saif Ur Rehman
c8b61007b0 Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults
# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py
2019-02-01 17:05:46 +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
Raffael Meyer
fef07eeae2 Merge remote-tracking branch 'upstream/develop' into develop 2019-01-31 22:16:26 +01:00
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
7a2163ca39 Merge branch 'hotfix' 2019-01-31 13:33:07 +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
38384be42b Merge branch 'hotfix' 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
5fdcd91847 Merge branch 'hotfix' 2019-01-30 12:38:00 +05:30
Saurabh
bb2031941e bumped to version 11.1.1 2019-01-30 13:08:00 +06:00
Nabin Hait
562516dcc4 Merge pull request #16521 from saurabh6790/add_patch_to_set_guardian_role
fix: patch to add guardian role if not exists
2019-01-30 12:00:00 +05:30
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
7ddbd386a5 Merge branch 'master' into hotfix 2019-01-29 18:56:45 +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
605fbf4f89 Merge branch 'staging' 2019-01-29 18:51:12 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
3f1fb9ca7e Merge branch 'staging-fixes' into staging 2019-01-29 18:26:34 +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
898977bda8 Merge branch 'hotfix' 2019-01-29 17:10:19 +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
bad36ef3ef fix: add node_modules to gitignore (#16515) 2019-01-29 16:00:45 +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
Nabin Hait
49c1f023b1 Merge pull request #16507 from rohitwaghchaure/fiscal_year_should_always_be_for_12_months
fix: fiscal year should always be for 12 months
2019-01-29 14:44:43 +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
82421e24f6 Merge branch 'develop' into usregional 2019-01-29 12:14:11 +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
0bfd990ada Merge pull request #16456 from adityahase/unicode
fix(unicode): Import unicode_literals in every file
2019-01-29 11:13:30 +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
57928a5382 Merge pull request #16468 from sagarvora/fix-scorecard
fix(buying): make supplier scorecard usable
2019-01-29 11:00:18 +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
Raffael Meyer
1f72b44f12 add german module with address template 2019-01-27 23:32:41 +01: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
f74e28bc64 Merge branch 'staging-fixes' into staging 2019-01-23 08:12:19 +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
d801437f5f Merge branch 'hotfix' 2019-01-23 08:08:53 +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
4d418b98f3 Merge branch 'staging-fixes' into staging 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
33bc3f3309 Merge branch 'hotfix' 2019-01-22 18:15:44 +05:30
Sagar Vora
2a9a867f05 bumped to version 10.1.79 2019-01-22 18:35:44 +05:50
Sagar Vora
ecf6467799 fix(travis): Redis must be working for caching, so reverting (#16455) 2019-01-22 17:41:56 +05:30
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
815c575a0b Merge branch 'staging-fixes' into staging 2019-01-22 15:45:56 +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
8c8e4fd130 Merge branch 'hotfix' 2019-01-22 15:33:48 +05:30
Sagar Vora
1e61dd024b bumped to version 10.1.78 2019-01-22 15:53:48 +05:50
Nabin Hait
cdcf474f12 Merge pull request #16447 from adityahase/ars-fix
fix(ar-summary-report): Changes to column list to match recent changes in AR Report
2019-01-22 15:08:46 +05:30
Nabin Hait
5582cadae3 Merge pull request #16332 from deepeshgarg007/email_digest
feat: Links to report in email digest
2019-01-22 14:30:46 +05:30
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
Nabin Hait
0abfcb5516 Merge pull request #16442 from rohitwaghchaure/pos_query_code_cleanup
fix: Code cleanup
2019-01-22 09:56:57 +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
Tyler Matteson
7928a685c8 Feat: US Regional module, added test, changed address template reference to convention 2019-01-20 09:55:44 -05:00
Deepesh Garg
f7fe08c487 Merge branch 'develop' into email_digest 2019-01-20 16:53:41 +05:30
Tyler Matteson
fdb8e4d427 Merge branch 'usregional' of https://github.com/agritheory/erpnext into usregional 2019-01-19 14:26:41 -05:00
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
7bea25a23a Merge pull request #16415 from ks093/ks093-shopping-cart-fixes
fix: Show stock validation message while placing order and Quotation series field fix in shopping cart settings.
2019-01-18 10:46:24 +05:30
Nabin Hait
6cc2a36c79 Merge pull request #16418 from nabinhait/stock_transfer_inter_company
Fix: Inter company stock transfer for serialised items
2019-01-18 10:45:07 +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
Tyler Matteson
53a6492f29 FEAT: US Regional Module with IRS 1099 reporting 2019-01-17 14:04:51 -05:00
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
Nabin Hait
c338188ce2 Merge pull request #16409 from SaiFi0102/Gross-Profit-Return-Fix
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-17 10:56: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
0e0f7c0d32 Merge pull request #16392 from nabinhait/mr_against_so
fix: Make material request from SO and raw material's rate as per UOM in BOM
2019-01-16 17:47:07 +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
Nabin Hait
d36bc5a9fd Merge pull request #16327 from nabinhait/group_warehouse_stock_reco
Fetch items based on group warehouse in Stock Reconciliation
2019-01-15 17:49:07 +05:30
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
910a744263 Merge pull request #16391 from nabinhait/cc_fix
fix: Travis fix for hotfix branch
2019-01-14 20:24:23 +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
Nabin Hait
6b466fe230 Merge pull request #16326 from hrwX/hotfix-gst-fix
fix: GSTIN validation
2019-01-10 11:23:42 +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
Nabin Hait
00d0f8bf26 Merge pull request #16371 from SaiFi0102/Override-Warehouse-Get-Item-Details
fix: Give Precedence to set_warehouse in get_item_details
2019-01-10 10:28:30 +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
Nabin Hait
05f86edd11 Merge pull request #16310 from deepeshgarg007/opportunity-lost-reason
feat: Opportunity lost reason selection using table multiselect
2019-01-08 16:18:07 +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
9ed6deb452 Merge pull request #16333 from deepeshgarg007/report-fix
fix: added customer group column in Item-wise Sales History report
2019-01-08 11:53:14 +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
f14c56488f Merge pull request #16325 from rohitwaghchaure/not_able_to_access_report_quoted_item_comparison
fix: report quoted item comparison not working
2019-01-07 14:55:14 +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
db40ea4f76 Merge pull request #16328 from rohitwaghchaure/fixed_salary_structure_employee_reqd
fix: employee is reqd to preview salary slip from salary structure
2019-01-07 14:30:57 +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
094d539cd9 Merge branch 'staging-fixes' into staging 2019-01-05 09:11:14 +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
Sagar Vora
53cac1b616 Merge pull request #16338 from sahil28297/remove_print_from_test_case
fix: Remove print statement from test case
2019-01-04 13:31:00 +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
Sagar Vora
cda289dc27 Merge pull request #16323 from sagarvora/fix_tests
fix: leave application and timesheet tests
2019-01-03 16:38:46 +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
Himanshu
a09a6e4020 Merge pull request #2 from frappe/hotfix
Hotfix
2019-01-03 12:47:03 +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
f9f753c95c fix: Added missing semicolon 2019-01-02 13:59:42 +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
ec86796d1b Merge pull request #16273 from surajshetty3416/general-ui-fixes
General UI fixes and changes
2018-12-31 11:58:43 +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
Saif Ur Rehman
1ea98cbbe1 fix: missing line due to conflict resolution 2018-12-28 00:29:43 +05:00
Saif Ur Rehman
07acc2bf5a Allow brand in quick entry 2018-12-27 23:10:20 +05:00
Saif Ur Rehman
7d9ee83d5a -Fix for updated get_default_cost_center
-Back to not updating item's defaults child table
2018-12-27 23:10:19 +05:00
Saif Ur Rehman
127b3f552b At least add a row for old logic to work properly 2018-12-27 23:03:17 +05:00
Saif Ur Rehman
c819ea38a0 -Added Item Default child table for Brand
-Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand
-Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults
2018-12-27 23:01:54 +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
1fa3f7d81e Merge branch 'staging-fixes' into staging 2018-12-26 12:04:55 +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
23ee3c6fbe Merge branch 'hotfix' 2018-12-26 11:09:34 +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
Suraj Shetty
33ba694f3a Revert "Modify bench_init.sh"
Point back to original repo

This reverts commit d3530125dd.
2018-12-26 11:32:06 +05:30
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
Suraj Shetty
6684c1ebff Merge branch 'permission-fixes' of https://github.com/surajshetty3416/erpnext into permission-fixes 2018-12-25 14:30:55 +05:30
Suraj Shetty
d3530125dd Modify bench_init.sh
- to point frappe branch in my repo with
changes to check if any test fails due to the changes
2018-12-25 14:30:50 +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
Saurabh
ce49f40b26 Merge pull request #16274 from rmehta/fix-child-qty-rate
fix(test): for update_child_qty_rate method
2018-12-25 11:19:47 +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
Faris Ansari
e095648810 Merge pull request #16269 from surajshetty3416/fix-daily-work-summary-patch
fix: daily_work_summary_settings migration patch
2018-12-24 11:58:13 +05:30
Suraj Shetty
83e3c4c0fa Fix quote error 2018-12-24 11:11:04 +05:30
Suraj Shetty
772e8780b4 Merge branch 'staging-fixes' into permission-fixes 2018-12-24 10:35:12 +05:30
Suraj Shetty
b58c317abb Fix daily_work_summary_settings migration patch 2018-12-24 10:26:39 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b Add and Modified DocTypes for Item Tax Template 2018-12-22 02:51:59 +05:00
Suraj Shetty
27c37e1b77 Minor fix 2018-12-21 12:43:46 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Frappe Bot
a509d4855b Merge branch 'staging-fixes' into staging 2018-12-21 05:46:22 +00:00
Frappe Bot
7067727c0c bumped to version 11.0.3-beta.31 2018-12-21 05:46:22 +00:00
Suraj Shetty
89625b6eef Rename learn to help 2018-12-21 11:04:32 +05:30
Nabin Hait
e9a2d57357 Merge pull request #16249 from shreyashah115/error-fix-2
Purchase order validation sql error
2018-12-21 10:59:20 +05:30
Suraj Shetty
b0a84f014e Replace desktop icon for project list with desktop icon for projects module
- Add a patch to fix already install instances
2018-12-20 20:12:37 +05:30
Charles-Henri Decultot
813485023b Filter cancelled and draft payments 2018-12-20 14:04:00 +00:00
Nabin Hait
16c3240ab7 Merge pull request #15973 from deepeshgarg007/accounts-receivable
Accounts receivable report based on payment terms
2018-12-20 14:16:22 +05:30
Nabin Hait
0866b2b75a Update accounts_receivable.py 2018-12-20 14:11:20 +05:30
shreyashah115@gmail.com
ba8c041206 fix: Check if items exist 2018-12-20 13:23:51 +05:30
Suraj Shetty
7ed37ae6c3 Commonify code
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
deepeshgarg007
b645c2c75e Rebase using staging-fixes and resolved conflicts 2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc Added temp variables for outstanding, credit_note_amt instead of function calling 2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af breaked up code into multiple functions 2018-12-19 18:43:06 +05:30
deepeshgarg007
4ac8fcf4af Added test case for Accounts receivable report based on payment terms 2018-12-19 18:43:06 +05:30
deepeshgarg007
a944f88b94 Removed column for pdc date 2018-12-19 18:43:06 +05:30
deepeshgarg007
17544d7ad6 Refactored accounts receivable report for payment terms 2018-12-19 18:43:06 +05:30
deepeshgarg007
e7a91b9526 Credit note fix 2018-12-19 18:43:06 +05:30
deepeshgarg007
f98adf2be5 Changed columns and added currency conditions 2018-12-19 18:43:06 +05:30
deepeshgarg007
b6c083706a Allocation of credit note amount and pdc in payment terms 2018-12-19 18:43:06 +05:30
deepeshgarg007
24f8d3ed0c Add columns based on payment terms 2018-12-19 18:43:06 +05:30
deepeshgarg007
a8ab9b5c3d Accounts Receivable report based on payment terms 2018-12-19 18:43:06 +05:30
Nabin Hait
a78947f2de Merge pull request #16218 from deepeshgarg007/analytics-graph
[Bug-fix] Analytics report graph skipping quarter values bug fix
2018-12-19 18:08:25 +05:30
Rohit Waghchaure
f6f503a1f6 [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice 2018-12-19 15:15:35 +05:30
Suraj Shetty
5555bf82f8 Capitalize marketplace factory class to support recent router changes (#16238) 2018-12-19 10:15:59 +05:30
Suraj Shetty
7ae2d59ffd Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Suraj Shetty
a8d9bfdcfd Fix: currency symbol issue in delivery note list (#16233) 2018-12-18 14:53:17 +05:30
Rohan
159897d88d fix(customer): Fix Total Unpaid amount in Customer dashboard (#16234) 2018-12-18 14:52:23 +05:30
rohitwaghchaure
c4921d235a Merge pull request #16225 from rohitwaghchaure/not_able_to_make_po_from_mr
[Fix] Get items from material request not working for PO
2018-12-17 18:52:46 +05:30
rohitwaghchaure
c5c2124bba Merge pull request #16226 from shreyashah115/fix-list
Fix employee separation list
2018-12-17 18:52:05 +05:30
rohitwaghchaure
ca62b19bff Merge pull request #16228 from shreyashah115/fix-student-report
Fix Student Fee Collection report
2018-12-17 18:50:48 +05:30
shreyashah115@gmail.com
a5dc08ee8e fix: remove paid_amount and modify query 2018-12-17 16:47:17 +05:30
shreyashah115@gmail.com
0543f03b58 fix: Remove date_of_joining from field list 2018-12-17 15:02:30 +05:30
rohitwaghchaure
37d7d25018 Merge pull request #16207 from Zlash65/fix-qi
[Minor] Make Quality Inspection in query configurable
2018-12-17 13:55:26 +05:30
rohitwaghchaure
d6ca23b277 Merge pull request #16219 from Zlash65/fix-holiday-leave
[Minor] Fix Leave Application as half day on Holiday validation
2018-12-17 13:54:16 +05:30
rohitwaghchaure
c963ac20a6 Merge pull request #16211 from Zlash65/fix-pp
[Minor] Get items for Material Requests fix
2018-12-17 13:52:25 +05:30
Rohit Waghchaure
4ac9ea0e85 [Fix] Get items from material request not working for PO 2018-12-17 11:18:46 +05:30
Zlash65
c8337c6d83 fix check for leave on holiday for half day 2018-12-15 21:15:45 +05:30
deepeshgarg007
1ee19e4167 Analytics report graph fix 2018-12-15 15:36:09 +05:30
Faris Ansari
871f4e5df5 Merge pull request #16201 from netchampfaris/fix-product-search
fix(product-search): Include variants in product search
2018-12-14 16:36:42 +05:30
Nabin Hait
22a1e281a9 fix(variant): Show attribute values on single variant creation (#16204) 2018-12-14 14:22:45 +05:30
Faris Ansari
4994d84565 fix(pos-profile): Cleanup Form for POS Profile (#16208)
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
2018-12-14 14:19:14 +05:30
Nabin Hait
d8f497ce98 Merge branch 'staging-fixes' into pplan_fix 2018-12-13 16:59:15 +01:00
Nabin Hait
614559f234 fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse 2018-12-13 16:36:35 +01:00
Zlash65
82e01bc923 fix fetch material request items logic 2018-12-13 18:31:05 +05:30
Zlash65
9fde660aaf make quality inspection in query configurable 2018-12-13 13:28:01 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Saurabh
58a4f0e157 bumped to version 11.0.3-beta.30 2018-12-13 11:15:31 +06:00
Prateeksha Singh
35ff4a8576 Merge pull request #15964 from pratu16x7/staging-fixes-setup-refactor
[setup][init] setup as document records
2018-12-13 00:22:30 +05:30
Prateeksha Singh
4ba9594b04 [setup] domain not in array 2018-12-12 22:09:00 +05:30
Prateeksha Singh
9c5676292c [setup] add defaults stage 2018-12-12 21:29:55 +05:30
Prateeksha Singh
58db3c1c7c [setup] fix install_defaults 2018-12-12 21:29:55 +05:30
Prateeksha Singh
0e728972e9 [setup][minor] remove unused import 2018-12-12 21:29:55 +05:30
Prateeksha Singh
d59b61cbd9 [fixtures] re-add market_segments and sales_stages utils 2018-12-12 21:29:55 +05:30
Prateeksha Singh
4da8dced94 [setup] remove unused imports 2018-12-12 21:29:55 +05:30
Prateeksha Singh
b274f8cb2a [fix] setup chart of accounts 2018-12-12 21:29:55 +05:30
Prateeksha Singh
47118ab72a [setup] remove redundant code
- [fix] domain setup from dictionary
2018-12-12 21:29:55 +05:30
Prateeksha Singh
9282e08099 [fix] >.< call setup_taxes 2018-12-12 21:29:55 +05:30
Prateeksha Singh
c3a49b9cad [fix] set default_bank_account in company 2018-12-12 21:29:55 +05:30
Prateeksha Singh
c0f90beb7c Rename 'Chat' to 'Gitter Chat' 2018-12-12 21:29:55 +05:30
Prateeksha Singh
1aee75aadc [setup] separate out setup_company 2018-12-12 21:29:55 +05:30
Prateeksha Singh
8469b27c3a [setup] add get_country_and_charts() 2018-12-12 21:29:55 +05:30
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
Faris Ansari
907e9080c4 fix(product-search): Include variants in product search 2018-12-12 19:26:52 +05:30
Ameya Shenoy
d630370183 Merge pull request #16190 from SaiFi0102/Travis-Fix
[Staging] Travis Fix: bench reinstall allow setting MariaDB root user/pass #6599
2018-12-12 18:17:51 +05:30
Saif Ur Rehman
b53231595d Using same filter for Sales Person from Accounts Receivable
Added Customer/Supplier Ledger Summary in Accounts Module page
2018-12-12 15:46:50 +05:00
Saif Ur Rehman
b07d108bee feat: Supplier Ledger Summary 2018-12-12 05:45:49 +05:00
Saif Ur Rehman
41236ed0e5 feat: Customer Ledger Summary report 2018-12-12 05:12:20 +05:00
Rushabh Mehta
eeab3ee5d3 fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192)
* debug(test): test_payroll_entry

* debug(test): test_payroll_entry

* debug(test): use frappe.db.rollback to undelete fixture data
2018-12-11 22:37:29 +05:30
Frappe Bot
4f3fd030ae Merge branch 'staging-fixes' into staging 2018-12-11 09:55:01 +00:00
Frappe Bot
fb2fdc4f4e Merge branch 'staging' into develop 2018-12-11 09:55:01 +00:00
Frappe Bot
caed845f3e bumped to version 11.0.3-beta.29 2018-12-11 09:55:01 +00:00
Pawan Mehta
377511165e Simple Trial Balance (#16060) 2018-12-10 21:55:01 +05:30
Frappe Bot
298796bea6 Merge branch 'staging-fixes' into staging 2018-12-10 16:05:45 +00:00
Frappe Bot
8e1326f22f Merge branch 'staging' into develop 2018-12-10 16:05:45 +00:00
Frappe Bot
ee97a46fde bumped to version 11.0.3-beta.28 2018-12-10 16:05:45 +00:00
Ameya Shenoy
cc552b7e39 Merge pull request #16191 from Alchez/revert-16131
Revert "fix(delivery): update package total on validate (#16131)"
2018-12-10 21:32:53 +05:30
Rohan
c1eb94d37f Revert "fix(delivery): update package total on validate (#16131)"
This reverts commit f43433b43d.
2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Frappe Bot
43c95e397a Merge branch 'staging-fixes' into staging 2018-12-10 13:08:33 +00:00
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Frappe Bot
0509d82701 bumped to version 11.0.3-beta.27 2018-12-10 13:08:33 +00:00
Tyler Matteson
afc55ca821 De-clutter, Regionalize and Domainify Accounts Module Configuration (on staging-fixes) (#16117) 2018-12-10 18:03:19 +05:30
Saif
b52bd9c093 AR/AP Report Enhancement (#16175)
* Modified AR/AP print format

* Filter Sales Person based on either Customer or Voucher's assigned Sales Person

* -Added Sales Person column to Accounts Receivable Summary
-Added all filters in AR/AP Summary Report as in AR/AP Report
-Reordered filters for better grouping
-Fixed a bug that customer_name was not unset after removing Customer from filter
2018-12-10 17:56:42 +05:30
Saif
c953fae0b4 Travis Fix: bench reinstall pass MariaDB root user/pass as arguments (#16173)
* Added root password to .travis.yml

* Rearranged arguments
2018-12-10 17:53:09 +05:30
Rohan
f43433b43d fix(delivery): update package total on validate (#16131) 2018-12-10 17:47:31 +05:30
rohitwaghchaure
5472fff027 Added disabled field in the address (#16114) 2018-12-10 17:45:39 +05:30
Frappe Bot
402ffa8b29 Merge branch 'hotfix' 2018-12-10 12:14:33 +00:00
Frappe Bot
65a9991d84 bumped to version 10.1.75 2018-12-10 12:14:33 +00:00
RicardoJohann
bc0ef0beca Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080) 2018-12-10 17:43:03 +05:30
rohitwaghchaure
398e47ecad Merge pull request #16189 from rohitwaghchaure/transferred_qty_issue
[Fix] Transferred qty cannot be null
2018-12-10 17:37:02 +05:30
Rohit Waghchaure
57633b75ed [Fix] Transferred qty cannot be null 2018-12-10 17:36:01 +05:30
Stavros Anastasiadis
3d82b74ea4 Update Items in Submit state can add new row (#15644)
* Update Items in Sumbit state can add new row

In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items

* Remove unused code line

* Remove blocking db save thread line

* Remove Company as not standard Field in Purchase Order Item

* Minor indentation fix

* Add Unit Test, add new row in update_child_qty_rate

* Codacy fix
2018-12-10 17:30:55 +05:30
Sagar Vora
4c5bd253a2 fix(party dashboard): empty array is truthy, check for length (#16184) 2018-12-10 17:19:10 +05:30
Rohan
39b31ece31 fix(pos): Return empty dict if no results found (#16124) 2018-12-10 17:16:39 +05:30
Deepesh Garg
0c3c148316 Linking company address to pos profile (#16142)
* Linking company address to pos profile

* Translation fix
2018-12-10 16:22:38 +05:30
Saif Ur Rehman
86853296a1 Rearranged arguments 2018-12-08 00:24:11 +05:00
Saif Ur Rehman
5608bc6d81 Added root password to .travis.yml 2018-12-07 23:04:28 +05:00
Nabin Hait
3248e0bb3e Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-07 15:20:23 +05:30
Nabin Hait
da9c96e9f5 Merge pull request #16150 from rohitwaghchaure/what_is_the_use_of_this_code
Removed unnecessary code
2018-12-07 15:18:11 +05:30
Nabin Hait
1b529d997c Merge pull request #16146 from rohitwaghchaure/remove_tax_amt_from_the_billed_amt_in_project
[Fix] In project, tax amount is added in the total billed amount(sales) field
2018-12-07 15:17:35 +05:30
Nabin Hait
01ccb8b099 Merge pull request #16144 from deepeshgarg007/list_view
[Fix]List view currency bug fix
2018-12-07 15:09:09 +05:30
Nabin Hait
2bd6ab9fba Merge pull request #16140 from KanchanChauhan/staging-fixes
[Minor]Method path fix in Material Request js
2018-12-07 15:08:44 +05:30
Deepesh Garg
6967b44ac8 Merge branch 'hotfix' into list_view 2018-12-07 08:30:20 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
67db77cfa8 Merge branch 'staging-fixes' into staging 2018-12-06 09:50:24 +00:00
Frappe Bot
4f1c659050 bumped to version 11.0.3-beta.26 2018-12-06 09:50:24 +00:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Frappe Bot
efb2712d14 Merge branch 'hotfix' 2018-12-06 09:14:35 +00:00
Frappe Bot
be0a349a52 bumped to version 10.1.74 2018-12-06 09:14:35 +00:00
Nabin Hait
32c95c3292 Merge pull request #16113 from nabinhait/travis-fix
fix(test): Fixed tests for discount with margin and period closing voucher
2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da fix(setup-wizard): Validate abbr length before switching to next slide 2018-12-06 07:37:32 +05:30
rohitwaghchaure
f85856d9f8 Merge pull request #16155 from rohitwaghchaure/changed_parent_for_item_attribute_value
[Fix] Permissions issue
2018-12-04 18:45:07 +05:30
Rohit Waghchaure
675567419b [Fix] Permissions issue 2018-12-04 18:43:52 +05:30
Rohit Waghchaure
e61430b471 Removed unnecessary code 2018-12-03 18:54:26 +05:30
Rohit Waghchaure
636d186d08 [Fix] In project, tax amount is added in the total billed amount(sales) field 2018-12-03 16:04:08 +05:30
deepeshgarg007
114cc810a0 List view currency bug fix 2018-12-03 15:13:06 +05:30
Kanchan Chauhan
9dc85153e0 [Minor]Method path fix in Material Request js 2018-12-03 14:39:43 +05:30
Nabin Hait
3ecb995485 Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull
fix/feat: Allow extension of barcode types (without validation)
2018-12-03 14:39:14 +05:30
Nabin Hait
94eafb6674 Merge pull request #16005 from ESS-LLP/pr_staging_fixes
[Feature][Fix] Healthcare - Patient Appointment
2018-12-03 14:38:32 +05:30
Nabin Hait
999dfda37b Merge pull request #16065 from deepeshgarg007/supplier-customer-dashboard-fix
Customer/Supplier dashboard fix for multi company setup
2018-12-03 14:37:05 +05:30
Nabin Hait
046a99acf8 Merge branch 'staging-fixes' into supplier-customer-dashboard-fix 2018-12-03 14:36:38 +05:30
Nabin Hait
02aad03e74 Merge pull request #16022 from ESS-LLP/fix-patch
fix: healthcare patch
2018-12-03 14:36:02 +05:30
Nabin Hait
6b93f2fe0a Merge pull request #16139 from Zlash65/fix-assess
[Minor] Assessment Result fix
2018-12-03 14:33:01 +05:30
Nabin Hait
0b4ea25f83 Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item
[Fix] Permissions issue while making item variants
2018-12-03 14:32:40 +05:30
Nabin Hait
dd7b020b01 fix(test): Fixed tests for period closing voucher 2018-12-03 14:24:41 +05:30
Nabin Hait
dce68422a7 Merge pull request #16133 from rohitwaghchaure/fixed_stock_value_diifference_calculation_for_stock_reco
[Fix] Stock value difference calculation for stock reconciliation
2018-12-03 14:20:40 +05:30
Nabin Hait
b60deebaa9 Merge pull request #16118 from deepeshgarg007/analytics-fix
Bug fixes for analytics report
2018-12-03 14:19:24 +05:30
Zlash65
db43c3af68 display message if details to fetch grade isnt filled up 2018-12-03 12:15:10 +05:30
Rohit Waghchaure
a8003c1af7 [Fix] Permissions issue while making item variants 2018-12-03 11:49:52 +05:30
deepeshgarg007
4c79274054 Fixed patch and deprecated grid reports 2018-11-30 18:01:22 +05:30
deepeshgarg007
ec5bbe351c Row check fix for purchase analytics 2018-11-30 16:25:16 +05:30
rohitwaghchaure
ce72d26e95 Merge pull request #16125 from frappe/revert-16112-accounts_receivable_summary_print_issue
Revert "[Fix] Accounts receivable summary print is not working"
2018-11-30 16:21:53 +05:30
Rohit Waghchaure
16b8ecbe05 [Fix] Stock value difference calculation for stock reconciliation 2018-11-30 16:20:52 +05:30
deepeshgarg007
94a3539015 Row check fix in stock analytics 2018-11-30 16:20:48 +05:30
deepeshgarg007
37b6a2ca0b row check bug fix 2018-11-30 16:15:43 +05:30
Nabin Hait
eda0a6eb33 fix(test): Fixed tests for period closing voucher 2018-11-30 15:15:17 +05:30
rohitwaghchaure
ca332bdcdb Revert "[Fix] Accounts receivable summary print is not working" 2018-11-29 18:15:29 +05:30
deepeshgarg007
ee05e358d1 Rewrote query using orm 2018-11-29 16:24:28 +05:30
deepeshgarg007
c981fb389b Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix 2018-11-29 14:57:50 +05:30
deepeshgarg007
3c7c4a61be Test case fix 2018-11-29 14:28:01 +05:30
deepeshgarg007
3eef6411dd Removed print statement 2018-11-29 13:10:02 +05:30
deepeshgarg007
9ed13f4a90 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix 2018-11-29 12:52:44 +05:30
deepeshgarg007
1a1c013b2a Analytics report bug fixes and code cleaning 2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0 Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Ameya Shenoy
5780e865b7 bumped to version 11.0.3-beta.25 2018-11-28 08:28:36 +00:00
Ameya Shenoy
2806d83362 Merge branch 'master' into staging-fixes 2018-11-28 08:12:48 +00:00
Ameya Shenoy
e3136c38e1 bumped to version 10.1.73 2018-11-28 07:57:27 +00:00
deepeshgarg007
ebe1e12a82 Codacy issue fixes 2018-11-28 08:21:54 +05:30
Nabin Hait
305c8b1fba Merge pull request #16110 from shreyashah115/fix-timer
[Timesheet] Element selector in Timer
2018-11-27 17:57:46 +05:30
Nabin Hait
ce870316c5 Merge pull request #16112 from rohitwaghchaure/accounts_receivable_summary_print_issue
[Fix] Accounts receivable summary print is not working
2018-11-27 17:57:17 +05:30
Nabin Hait
f642f86982 Merge branch 'hotfix' into accounts_receivable_summary_print_issue 2018-11-27 17:56:49 +05:30
Nabin Hait
96598936ad fix(test): Fixed tests for discount with margin and period closing voucher 2018-11-27 17:48:13 +05:30
deepeshgarg007
c1a3c72b49 final dashboard design 2018-11-27 17:09:12 +05:30
Rohit Waghchaure
10bcd5113c [Fix] Accounts receivable summary print is not working 2018-11-27 16:25:35 +05:30
deepeshgarg007
f31caffa74 Changes in get_dashboard_info 2018-11-27 15:04:12 +05:30
Nabin Hait
3b16dd7377 Merge branch 'staging-fixes' into pr_staging_fixes 2018-11-27 14:19:49 +05:30
Nabin Hait
dfd79b0349 Merge branch 'staging-fixes' into gbm001-item-barcodes-pull 2018-11-27 14:19:20 +05:30
Nabin Hait
15ca2f438f Merge pull request #16029 from Alchez/hotfix-child-task-error
Fix error when trying to convert a task into a group even if no child tasks exist
2018-11-27 14:17:32 +05:30
Nabin Hait
676a2fbc8a Merge branch 'staging-fixes' into hotfix-child-task-error 2018-11-27 14:17:23 +05:30
deepeshgarg007
6372fbba54 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix 2018-11-27 14:06:58 +05:30
Nabin Hait
3854940e42 Merge branch 'staging-fixes' into fix-patch 2018-11-27 13:26:05 +05:30
Nabin Hait
e4cc062cf1 Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 13:22:50 +05:30
Nabin Hait
b98d08a2cb Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation
[Fix] Incorrect stock value difference because of negative stock
2018-11-27 13:21:43 +05:30
Nabin Hait
0090b1aa16 Merge pull request #16058 from KanchanChauhan/reflinks-in-related-docs
Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate
2018-11-27 13:20:39 +05:30
Nabin Hait
ccb03fb255 Merge pull request #16073 from deepeshgarg007/receivable-summary
Accounts receivable summary print fix
2018-11-27 13:11:37 +05:30
shreyashah115@gmail.com
5281fe8e50 fix: Element selector 2018-11-27 13:11:30 +05:30
Nabin Hait
72fc1b57be Merge pull request #16083 from Anurag810/new-fix-branch
[fix] delivery note with quantity equal 0 #14211
2018-11-27 13:10:31 +05:30
Nabin Hait
3c31e4ad4b Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items
If is pos is enabled and no pos profile then use the item's default warehouse for packing materials
2018-11-27 13:10:14 +05:30
Nabin Hait
6743219dc2 Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice
[Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice
2018-11-27 13:09:16 +05:30
Nabin Hait
5f7b37ee11 Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue
[Fix] No permission for Manufacturing Settings
2018-11-27 13:07:44 +05:30
Rohit Waghchaure
6cc2f52fa4 [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice 2018-11-27 12:07:03 +05:30
Nabin Hait
dde952d591 Merge pull request #16092 from deepeshgarg007/salary_slip
Salary slip earnings and deductions table bug fix
2018-11-27 11:39:10 +05:30
Nabin Hait
a9f72bd3ce Merge pull request #16108 from KanchanChauhan/indicators-in-leave-applications
[Minor] Indicators in Leave Application
2018-11-27 11:38:44 +05:30
Nabin Hait
9a06543453 Merge branch 'staging-fixes' into indicators-in-leave-applications 2018-11-27 11:38:29 +05:30
Nabin Hait
9a4cf4dce9 Merge pull request #16100 from deepeshgarg007/test-fix
Removed total label from graph
2018-11-27 11:37:30 +05:30
Nabin Hait
f48cf001ed Merge branch 'staging-fixes' into test-fix 2018-11-27 11:37:22 +05:30
Nabin Hait
be65af5dfe Merge pull request #16101 from SaiFi0102/patch-1
Company rename abbr to consider more DocTypes
2018-11-27 11:36:46 +05:30
Nabin Hait
57fa8759ee Merge pull request #16102 from deepeshgarg007/fees
Paid Amount not showing for fees in web portal fix
2018-11-27 11:36:27 +05:30
Nabin Hait
df8fb59511 Merge pull request #16099 from SaiFi0102/SO-Validate-Set-GrossProfit
Set Gross Profit on server-side validation of Sales Order
2018-11-27 11:19:15 +05:30
Nabin Hait
f806cfecaa Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit 2018-11-27 11:18:54 +05:30
Kanchan Chauhan
2d0b788105 [Minor] Indicators in Leave Application 2018-11-27 10:37:23 +05:30
Nabin Hait
0695ea21b5 Merge pull request #16019 from frappe-pr-bot/translations-2018-11-19
[Translation] Updated Translations
2018-11-26 21:04:13 +05:30
deepeshgarg007
bc513a8828 Removed paid amount form Fees doctype 2018-11-26 20:43:39 +05:30
deepeshgarg007
a9525de0da paid amount fix in fees 2018-11-26 20:34:32 +05:30
Saif
6a9d9d76ef Company rename abbr to consider more DocTypes 2018-11-26 19:56:13 +05:00
Nabin Hait
78d9fac0ce Merge branch 'staging-fixes' into pr_staging_fixes 2018-11-26 20:25:34 +05:30
Nabin Hait
15951e6e93 Merge branch 'staging-fixes' into gbm001-item-barcodes-pull 2018-11-26 20:25:29 +05:30
Nabin Hait
93595fa60a Merge branch 'staging-fixes' into hotfix-child-task-error 2018-11-26 20:24:47 +05:30
Nabin Hait
91c811f170 Merge branch 'staging-fixes' into new-fix-branch 2018-11-26 20:23:37 +05:30
Nabin Hait
c5064069c7 Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue 2018-11-26 20:23:11 +05:30
Nabin Hait
218fa51dba Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice 2018-11-26 20:23:00 +05:30
Nabin Hait
9fba32a917 Merge pull request #16098 from rohitwaghchaure/on_uncheck_is_return_clear_reference_number
On disabled is return field clear the reference field
2018-11-26 20:20:30 +05:30
Nabin Hait
73e3138a5b Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number 2018-11-26 20:20:22 +05:30
deepeshgarg007
05c2989698 removed total from graph 2018-11-26 20:19:57 +05:30
Nabin Hait
0ccc05bdf7 Merge pull request #15997 from rohitwaghchaure/address_not_set_from_api
[Fix] Address not set from the API
2018-11-26 20:17:03 +05:30
Nabin Hait
7f02659425 Merge branch 'hotfix' into address_not_set_from_api 2018-11-26 20:16:54 +05:30
Nabin Hait
9170c2daab Merge pull request #15989 from deepeshgarg007/bug-fixes
Minor issue fixes
2018-11-26 20:05:25 +05:30
Nabin Hait
b32abde2ac Merge branch 'staging-fixes' into bug-fixes 2018-11-26 20:05:09 +05:30
Nabin Hait
2598c475ed Merge pull request #15999 from codingCoffee/css
css: build files in v10
2018-11-26 20:02:18 +05:30
Saif Ur Rehman
5fdbc68ca3 Set Gross Profit on server-side validation of Sales Order 2018-11-26 19:32:16 +05:00
Rohit Waghchaure
b4a5993ece On uncheck is return field clear the reference field 2018-11-26 20:02:01 +05:30
Nabin Hait
21983b8432 Merge pull request #16001 from jsukrut/staging-fixes
[FIX][#15018][PATIENT Relation should be unique]
2018-11-26 20:01:19 +05:30
Nabin Hait
bcd0ba0d69 Merge pull request #16041 from surajshetty3416/pos-profile-fix
fix: Add additional condition to get_pos_profile
2018-11-26 19:59:17 +05:30
Nabin Hait
56dc5c1be3 Merge branch 'staging-fixes' into pos-profile-fix 2018-11-26 19:59:07 +05:30
Nabin Hait
212a29ae2c Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
[Fix] Not able to view general ledger for purchase invoice
2018-11-26 19:57:24 +05:30
Nabin Hait
25e60f3934 Merge pull request #16044 from ESS-LLP/fix-trial-balance
fix: Trial Balance print
2018-11-26 19:56:27 +05:30
Nabin Hait
4191d7eb52 Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
Fixed get_buying_amount in Gross Profit report:
2018-11-26 19:55:06 +05:30
Nabin Hait
d0af0887be Merge pull request #16051 from SaiFi0102/patch-1
Remove "Test" Letter Head
2018-11-26 19:47:07 +05:30
Nabin Hait
70642a0ae4 Merge pull request #16055 from rohitwaghchaure/fixed_holiday_list_not_working
[Fix] New holiday list form is not working
2018-11-26 19:44:19 +05:30
Nabin Hait
36f266355d Merge branch 'staging-fixes' into fixed_holiday_list_not_working 2018-11-26 19:44:11 +05:30
Nabin Hait
ad1fba6a70 Merge branch 'develop' into reflinks-in-related-docs 2018-11-26 19:42:55 +05:30
Nabin Hait
736ce9a176 Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation
Fixed error due to incorrect use of 'this' while calculating rate
2018-11-26 19:31:25 +05:30
Saif Ur Rehman
147fa73d3f Fixed incorrect use of 'this' causing errors calculating rate 2018-11-26 18:14:06 +05:00
Rohit Waghchaure
d1a85a3637 [Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice 2018-11-26 18:42:29 +05:30
Rohit Waghchaure
15ed7a6351 [Fix] No permission for Manufacturing Settings 2018-11-26 17:31:18 +05:30
Anurag Mishra
e5248b6933 Merge branch 'new-fix-branch' of https://github.com/anurag810/erpnext into new-fix-branch 2018-11-26 17:25:28 +05:30
Anurag Mishra
5b6dd58b3e fixed ZeroDivisionError in sales_order.py 2018-11-26 17:22:50 +05:30
Nabin Hait
fc6194e640 Merge branch 'staging-fixes' into new-fix-branch 2018-11-26 17:16:06 +05:30
Nabin Hait
b5fbfaf4cd Merge pull request #16089 from frappe/update-stale-bot
[stale] Increase Number of days of inactivity
2018-11-26 17:15:46 +05:30
Nabin Hait
d5fc05c10b Merge pull request #16090 from frappe/update-stale-bot-1-2
Update stale.yml
2018-11-26 17:15:19 +05:30
Nabin Hait
e8469daf0c Merge branch 'staging-fixes' into update-stale-bot-1-2 2018-11-26 17:14:59 +05:30
Nabin Hait
f7b6c95326 Merge pull request #16087 from surajshetty3416/update-eslint-config
fix[eslintrc]: Add Vue to globals
2018-11-26 17:14:25 +05:30
deepeshgarg007
bd87903b56 Added condition for default amount 2018-11-26 17:13:59 +05:30
Anurag Mishra
e657fe84b8 making validation generic for sales order,sales invoice,purchase order etc. 2018-11-26 17:13:10 +05:30
Anurag mishra
6ddb15b3df fix(validate): Qty is mandatory in delivery note 2018-11-26 17:13:10 +05:30
Anurag mishra
7b2c445707 Delivery Note fixes 2018-11-26 17:13:10 +05:30
Nabin Hait
059c6f8da5 Merge pull request #16070 from nabinhait/travis-fix-1
Travis fixes
2018-11-26 17:00:10 +05:30
Nabin Hait
73ca3cfca6 fix(test): removed test print 2018-11-26 16:16:42 +05:30
Anurag Mishra
42d3af3bbb making validation generic for sales order,sales invoice,purchase order etc. 2018-11-26 15:19:17 +05:30
deepeshgarg007
533066eb87 Salary slip bug fix 2018-11-26 15:04:21 +05:30
Prateeksha Singh
758ca946fa Update stale.yml 2018-11-26 14:45:54 +05:30
Prateeksha Singh
50b6a5ddc8 Update stale.yml 2018-11-26 14:44:26 +05:30
Rohit Waghchaure
3893ba302c If is pos and no pos profile use the item's default warehouse for packing materials 2018-11-26 14:13:24 +05:30
Suraj Shetty
584430c49c Add vue to globals
- Also set sourceType as module to avoid import lint error
2018-11-26 12:32:29 +05:30
Anurag mishra
66bd5810c5 fix(validate): Qty is mandatory in delivery note 2018-11-26 11:36:57 +05:30
Anurag mishra
bc4574b59d Delivery Note fixes 2018-11-26 11:33:22 +05:30
Nabin Hait
2665c37f38 temp(travis): Print statement to fix travis 2018-11-26 11:05:28 +05:30
Nabin Hait
48e0e19b03 fix(test): Fixed salary slip and sales analytics test cases 2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097 fix(test): Test cases fixed 2018-11-26 11:05:28 +05:30
Nabin Hait
f77cd54a6c fix(tds): Create tds payable under correct parent 2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2 Test case fix and other minor bug fix 2018-11-26 11:05:28 +05:30
deepeshgarg007
5dbb9f5312 Accounts receivable summary print fix 2018-11-23 19:54:08 +05:30
deepeshgarg007
a1cffc3490 minor changes in dashboard 2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a Added colspan to indicators 2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f Customer/Supplier dashboard fix for multi company setup 2018-11-23 10:17:28 +05:30
Kanchan Chauhan
962397e6f4 Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate 2018-11-22 15:15:06 +05:30
Rohit Waghchaure
037a151ef5 [Fix] New holiday list form is not working 2018-11-22 12:57:34 +05:30
Saif
2a2f2742eb Remove "Test" Letter Head 2018-11-21 23:29:09 +05:00
Rohit Waghchaure
6424f47f3b [Fix] Incorrect stock value difference because of negative stock 2018-11-21 23:18:41 +05:30
Ranjith
1879e91148 fix: Trial Balance 2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5 Fixed get_buying_amount in Gross Profit report:
To handle the case where there may be multiple invoices for a single delivery
2018-11-21 15:32:37 +05:00
Suraj Shetty
1eb098caf9 Add additional condition condition to get_pos_profile
- If we have any POS Profile related to the user,
that profile should be used
2018-11-21 14:36:58 +05:30
Rohan Bansal
f838597b5f fix(task): Fix error when trying to convert a task into a group even if no child tasks exist 2018-11-20 13:18:05 +05:30
Rohit Waghchaure
770a13ebc3 [Fix] Not able to view general ledger for purchase invoice 2018-11-20 13:01:52 +05:30
Ranjith
5d2e52c4ef fix: healthcare patch 2018-11-19 20:03:25 +05:30
frappe-pr-bot
2ed4d84cd3 [Translation] Updated Translations 2018-11-19 11:57:50 +02:00
Jamsheer
64e42e1e88 fix: Patient Appointment - update list view 2018-11-19 13:00:49 +05:30
Jamsheer
ee6b317ab5 fix: Patient Appointment - Code standards 2018-11-19 13:00:49 +05:30
Jamsheer
45695c9bcb fix: Realign Patient Appointment fields 2018-11-19 13:00:49 +05:30
Jamsheer
dc3ae114cd feat: Reschedule - Patient Appointment 2018-11-19 13:00:49 +05:30
Andrew McLeod
f99a68a695 feat: Added unit testing for Item Barcodes in item.py
Adds three different barcodes and barcodes types to a test item and
checks that they are added correctly.
Adds a barcode that already exists, and checks a DuplicateEntryError
is raised.
Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of
ValidationError) is raised.
2018-11-16 13:55:55 +00:00
Andrew McLeod
5607762c0f fix/feat: Allow extension of barcode types (without validation)
Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py:
- There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces.
- All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated.
This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.
2018-11-16 11:08:39 +00:00
Jsukrut
b9a95e29b7 [FIX][#15018][PATIENT Relation should be unique] 2018-11-16 11:30:12 +05:30
Ameya Shenoy
27a0c37963 css: build files in v10 2018-11-15 19:21:30 +00:00
Rohit Waghchaure
f4dc71661d [Fix] Address not set from the API 2018-11-15 17:04:02 +05:30
deepeshgarg007
795686d1cc Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes 2018-11-15 16:30:48 +05:30
Frappe Bot
8c7373dfd0 Merge branch 'staging' into develop 2018-11-15 09:45:05 +00:00
Frappe Bot
64b4d98778 Merge branch 'staging-fixes' into staging 2018-11-15 09:43:08 +00:00
Frappe Bot
d9dccaefba bumped to version 11.0.3-beta.24 2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197 bumped to version 11.0.3-beta.23 2018-11-15 09:37:17 +00:00
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Nabin Hait
0aca5aad14 Merge pull request #15976 from deepeshgarg007/summary
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Nabin Hait
a0a2f58a21 Merge pull request #15985 from adityahase/perf-patch
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Frappe Bot
6647ea270c Merge branch 'staging-fixes' into staging 2018-11-15 09:19:18 +00:00
Frappe Bot
a4fe912382 bumped to version 11.0.3-beta.23 2018-11-15 09:19:18 +00:00
Frappe Bot
98b4a1bc81 Merge branch 'master' into staging-fixes 2018-11-15 09:12:04 +00:00
Frappe Bot
0b697c5298 Merge branch 'hotfix' 2018-11-15 09:04:14 +00:00
Frappe Bot
2426d00dd6 bumped to version 10.1.72 2018-11-15 09:04:14 +00:00
rohitwaghchaure
cc907559d0 Merge pull request #15992 from rohitwaghchaure/code_optimization_for_consolidated_report
Code optimization for consolidated financial statement report
2018-11-15 13:48:17 +05:30
Rohit Waghchaure
704796b1cb Code optimization for consolidated financial statement report 2018-11-15 13:46:18 +05:30
rohitwaghchaure
02a7f8f0b2 Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:56:11 +05:30
Rohit Waghchaure
9d0f90975b [Fix] Consolidated financial statement report currency conversion issue 2018-11-15 12:55:20 +05:30
rohitwaghchaure
93f358778b Merge pull request #15990 from rohitwaghchaure/patch_code_refactor
[Minor] Patch fixes
2018-11-15 12:21:46 +05:30
Rohit Waghchaure
43920530a1 [Minor] Patch fixes 2018-11-15 12:20:27 +05:30
deepeshgarg007
4c366eed23 Minor issue fixes 2018-11-15 12:02:07 +05:30
Deepesh Garg
3b8c84fa75 Merge pull request #15975 from nabinhait/staging-fixes
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-15 12:01:09 +05:30
rohitwaghchaure
e907c0d15c Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report
Added currency filter in consolidated financial statement report
2018-11-15 10:53:02 +05:30
Rohit Waghchaure
a95697f506 Added currency filter in consolidated financial statement report 2018-11-14 19:55:44 +05:30
Aditya Hase
d168a71cfb perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
update_total_qty_field patch was using UPDATE statement with CASE

Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Frappe Bot
e4193030b1 Merge branch 'staging-fixes' into staging 2018-11-14 11:33:03 +00:00
Frappe Bot
fac49983a0 bumped to version 11.0.3-beta.22 2018-11-14 11:32:34 +00:00
rohitwaghchaure
ba97b9b2d8 Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 15:12:45 +05:30
rohitwaghchaure
593f3f1756 Merge pull request #15978 from nabinhait/fetch_from_fix
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-14 15:11:26 +05:30
rohitwaghchaure
5395b164cd Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue
Claimed amount is not reset on cancel of employee advance
2018-11-14 13:21:11 +05:30
Rohit Waghchaure
047a7123eb Claimed amount is not reset on cancel 2018-11-14 13:20:00 +05:30
Rohit Waghchaure
917dda1b76 [Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually 2018-11-14 01:18:41 +05:30
Nabin Hait
367a076fa4 fix(discount): Fixed item discount amount calculation 2018-11-13 18:41:58 +05:30
Nabin Hait
d34bfa8c2c fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes 2018-11-13 18:21:22 +05:30
Frappe Bot
fe62024824 bumped to version 11.0.3-beta.21 2018-11-13 11:41:27 +00:00
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Nabin Hait
3409e55d24 Merge pull request #15974 from Alsum/assign-sa
assign-sa-to-group-of-employees
2018-11-13 16:55:17 +05:30
deepeshgarg007
7bc6f3843a Fix for accounts Receivable Summary Showing zero values 2018-11-13 16:54:54 +05:30
Frappe Bot
25a74b8283 Merge branch 'staging-fixes' into staging 2018-11-13 11:23:06 +00:00
Frappe Bot
a29237beeb bumped to version 11.0.3-beta.21 2018-11-13 11:23:06 +00:00
Nabin Hait
7fe4124bb8 fix(field property): Made barcode field non-mandatory in item 2018-11-13 16:48:59 +05:30
Frappe Bot
88c88d6e7c Merge branch 'master' into staging-fixes 2018-11-13 10:59:05 +00:00
Frappe Bot
cb1726d6ec Merge branch 'hotfix' 2018-11-13 10:55:31 +00:00
Frappe Bot
6b78e520d2 bumped to version 10.1.71 2018-11-13 10:55:31 +00:00
Nabin Hait
688758a56f fix(test): Fixed item discount amount calculation and test cases related to pricing rule 2018-11-13 16:13:16 +05:30
alsum
e04a753d53 assign-sa-to-group-of-employees 2018-11-13 11:43:58 +02:00
Nabin Hait
ee887f4db7 Merge pull request #15796 from Alsum/set_current_asset_value
trigger set_current_asset_value when make asset_value_adjustment from asset form
2018-11-13 12:42:28 +05:30
Nabin Hait
ee190e34c2 Update asset_value_adjustment.js 2018-11-13 12:41:36 +05:30
Saif
60ec88bcc8 Added Default Warehouse field that sets all item's warehouse (#15462)
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied

* Set def_warehouse in test_sales_order.py

* Changed from def_warehouse to set_warehouse

* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Alchez
ce3340903d Update Delivery Trip status based on visited stops (#15723)
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops

* feat(delivery_trip_status): Fix tests

* feat(delivery_trip_status): Fix allow on submit for status

* feat(delivery_trip_status): Change status mapping

* feat(delivery_trip_status): Fix patch

* Update update_delivery_trip_status.py
2018-11-13 12:22:17 +05:30
Alchez
9f87c441b0 feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view (#15706) 2018-11-13 12:20:05 +05:30
khushalti
fad08e1bcb [fix] - GL entry not creating on PR if rejected qty mentoned (#15815) 2018-11-13 12:09:32 +05:30
Doridel Cahanap
2b14d6a058 Contract Manufacturing : Customer Provided Items (#15828)
* Material Request from Production Plan for Customer provided parts

* Test cases

* Customer web portal for their material requests
2018-11-13 12:07:16 +05:30
Alchez
6f1fd193eb fix(production_plan): Allow work orders to be cancelled (#15955) 2018-11-13 11:47:23 +05:30
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
Britlog
7d9689cc92 [Fix] Website Conversion factor query (#15866)
* [Fix] Conversion factor query

* Update product.py
2018-11-13 11:36:41 +05:30
Rohit Waghchaure
14ffe8b935 [Fix] Company dashboard sales count condition 2018-11-13 11:35:38 +05:30
Britlog
9e9e37d39b [Fix] Conversion factor in offline POS (#15867) 2018-11-13 11:34:27 +05:30
Deepesh Garg
b65bb5df2e Function renaming, code cleaning and minor fixes (#15938) 2018-11-13 11:28:58 +05:30
Stavros Anastasiadis
a695dad525 Upgrade BOM Stock Report base with Qty to Produce (#15939) 2018-11-13 11:17:41 +05:30
Shreya Shah
89974b221d [Feature] Create Raw Material Request from Sales Order (#15452)
* Add new button to Sales Order form - Request for Raw Materials

* Modify get_work_order_items function

* Commonify functions in Production Plan to make it compatible with new feature

* Create and submit Material Request from Sales Order

* Link Sales Order with Material Request

* Minor

* Rename label

* Fix Codacy

* Modify as per review suggestions

- Move dialog to a new function
- Move checkboxes below other fields

* Minor changes

* Check for permissions

* Add common checkboxes for all items

* Fix codacy

* fix: Travis

* fix: Use variable to store query result

* fix: Add comment before fetching exploded items

* refactor: Break into multiple functions

* test: Add test case
2018-11-13 11:15:03 +05:30
Himanshu Mishra
35b2627112 Item qty based tax (CESS) calculation support (#15456)
* fix conflicts

* added test case for qty cess

* use company specified in document to get region
2018-11-13 11:13:04 +05:30
Zarrar
6922415d1b [New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731)
* Update transaction.js

* setup barcode scan

stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js

* fix bug of item_code change always reset qty to 0

when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* clean up barcode logic for transactions

* call scan_barcode method for stock entry

* separate out logic for searching serial, batch or barcode number

* added scan barcode field in transactions doctype

* search barcode-serial-batch sequence, code rectify

* hide all barcode related field if disabled from settings

* remove print statement

* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Ameya Shenoy
42928f978b fix: work order item sorting (#15967) 2018-11-13 11:04:17 +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
Ameya Shenoy
3d58576797 Merge pull request #15963 from codingCoffee/frankfurter
fix: changed currency exchange API to frankfurter
2018-11-12 17:55:48 +05:30
Deepesh Garg
84483ff776 Stock analytics script report (#15630)
* Stock analytics script report

* Codacy Issue Fixes

* Codacy Issue Fixes

* Removed Trailing Whitespaces

* Code cleaning and optimization

* Minor Changes

* Code cleaning and spacing

* Added link for stock analytics in stock.py

* Refactoring and code cleaning

* Codacy issue fixes
2018-11-12 17:05:31 +05:30
Deepesh Garg
a057f4c2a0 Script report for purchase analytics (#15612)
* Purchase Analytics Query Report

* Minor Changes

* Codacy Issue Fixes

* Codacy Issues Fixed

* Code cleaning and optimization

* Indentation Issue Fix

* Code cleaning and better function naming

* Added link for purchase analytics in buying.py

* Added link for production analytics in manufacturing.py

* Commonified purchase-analytics using Analytics class

* Codacy issue fix
2018-11-12 17:01:02 +05:30
rohitwaghchaure
ab76ff0836 Added new option group by voucher(consolidated) in the general ledger report (#15957) 2018-11-12 16:58:24 +05:30
Nabin Hait
5e85ab3b67 Update setup.py 2018-11-12 16:46:12 +05:30
JodeQ
1b8e9cd3bb Permission error for new Sales invoice (#15952)
In version
```
Installed Apps
ERPNext: v11.0.3-beta.20 () (staging)
Frappe Framework: v11.0.3-beta.25 () (staging)
```

When creating a new Sales invoice without healthcare active we have this error
```
Not permitted
Insufficient Permission for Patient
```
Console log
```
Traceback (most recent call last):
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application
    response = frappe.handler.handle()
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call
    return fn(*args, **newargs)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link
    search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget
    as_list=not as_dict)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list
    return frappe.model.db_query.DatabaseQuery(doctype).execute(None, *args, **kwargs)
  File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute
    raise frappe.PermissionError(self.doctype)
PermissionError: Patient
```
2018-11-12 16:42:05 +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
Deepesh Garg
6714214951 Server side script report for sales analytics (#15589)
* Sales Analytics Report

* Codacy issue fixes and  name column addition

* Minor Fixes

* Minor Changes

* Codacy Issue Fixes

* Codacy Issue Fixes

* Bug Fixes

* Code cleaning and optimization

* Deleted Duplicate code

* Indentation Issue Fixes

* Added Supplier Condition

* Cleaned code and better function naming

* Added report link for sales analytics in selling.py

* fix(patch): Patch to delete old analytics reports

* feat(refactor): Created class and refactored code using object oriented paradigm

* Column condition fix

* Minor condition fix

* Minor fix

* parent child map for purchase analytics

* Minor Fixes in get_periodic_data

* Used dots for filters instead of brackets

* Minor Bug fix in get_period_date_ranges

* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
Ameya Shenoy
47a1dbab96 fix: changed currency exchange API to frankfurter (#15958)
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:57:24 +05:30
Frappe PR Bot
3922a184af [Translation] Updated Translations (#15959) 2018-11-12 15:51:37 +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
Frappe Bot
1ff9c691b7 Merge branch 'staging' into develop 2018-11-09 10:21:07 +00:00
Frappe Bot
35ec2469e9 Merge branch 'staging-fixes' into staging 2018-11-09 10:19:21 +00:00
Frappe Bot
9159ee83ca bumped to version 11.0.3-beta.20 2018-11-09 10:19:21 +00:00
Frappe Bot
4df671585b Merge branch 'master' into staging-fixes 2018-11-09 10:11:27 +00:00
Frappe Bot
f001a9eb4f Merge branch 'hotfix' 2018-11-09 10:09:04 +00:00
Frappe Bot
f8a5cfe8d8 bumped to version 10.1.70 2018-11-09 10:09:04 +00:00
alsum
852bd76a58 add set_current_asset_value to onload func 2018-11-08 11:12:33 +02:00
TaiLouis
c856794519 fix(hr): Delete salary slip when cancel payroll entry (#15757) 2018-11-08 13:06:24 +05:30
rohitwaghchaure
a88eaa6e20 [Fix] User able to change discount if pricing rule has discount value as zero (#15921) 2018-11-08 13:05:08 +05:30
Alchez
bf20be53ef fix(bom): Display item name in new BOM form (#15783) 2018-11-08 12:54:20 +05:30
Shreya Shah
9e484fbc12 fix(payment-entry): Take default value None for paid_from (#15777) 2018-11-08 12:52:14 +05:30
patilsangram
667f0fbd6d [fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no (#15785) 2018-11-08 12:51:41 +05:30
Ameya Shenoy
49647bfecc fix: develop version should be 12 (#15928) 2018-11-08 12:48:35 +05:30
Nabin Hait
6ff2f395f5 fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero (#15825) 2018-11-08 12:30:44 +05:30
Dominik Ottenbreit
63ec78aa5d Fix Purchase Order Issue in Update Items (#15811)
* Fix Purchase Order Issue in Update Items

* fix(zero-division)
2018-11-08 12:28:57 +05:30
Bassam Ramadan
bf86953b4c adding returns field to cashier closing (#15752)
* adding returns field to cashier closing

* Update cashier_closing.json
2018-11-08 12:26:24 +05:30
Zarrar
5be6d19f4d [Minor] Display Discount Amount when Tax table is empty (#15812)
* show discount amount even when tax table is empty

* negate the value for discount while printing
2018-11-08 12:16:26 +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
Shreya Shah
3f6eb6b393 fix: If party type is Shareholder, set appropriate name field (#15916) 2018-11-08 11:51:13 +05:30
Frappe Bot
823e754565 Merge branch 'master' into staging-fixes 2018-11-07 11:26:11 +00:00
Frappe Bot
ccff3e2aec Merge branch 'hotfix' 2018-11-07 11:26:10 +00:00
Frappe Bot
7f37d26f05 bumped to version 10.1.69 2018-11-07 11:26:10 +00:00
Shreya Shah
c704630d5f fix: Return default if company not found (#15915) 2018-11-06 17:24:45 +05:30
Ameya Shenoy
ea42980de6 Merge branch 'staging' into develop 2018-11-06 11:17:24 +00:00
Ameya Shenoy
96a2f00c07 Merge branch 'staging-fixes' into staging 2018-11-06 11:13:36 +00:00
Ameya Shenoy
675636cd03 bumped to version 11.0.3-beta.19 2018-11-06 11:13:36 +00:00
Ameya Shenoy
0c42f99b6f Merge pull request #15920 from rohitwaghchaure/fix_patch_ascii_code_error
[Fix] Patch, ascii codec error
2018-11-06 16:35:21 +05:30
Rohit Waghchaure
56bf39bfea [Fix] Patch 2018-11-06 16:32:29 +05:30
Ameya Shenoy
65797bca64 Merge branch 'master' into staging-fixes 2018-11-06 11:02:08 +00:00
Ameya Shenoy
1a41929c6b Merge branch 'hotfix' 2018-11-06 11:02:04 +00:00
Ameya Shenoy
a97a520aa8 bumped to version 10.1.68 2018-11-06 11:02:04 +00:00
rohitwaghchaure
b5ba867b3f Merge pull request #15917 from nabinhait/encoding-issue
fix(encoding): Fixed encoding issue in financial statements
2018-11-06 15:37:23 +05:30
rohitwaghchaure
9eafe8c23e Update financial_statements.py 2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3 fix(encoding): Fixed encoding issue in financial statements 2018-11-06 11:48:51 +05:30
Faris Ansari
bbc1cb274e Merge pull request #15911 from netchampfaris/marketplace-fixes-3
Hub fixes
2018-11-05 19:19:44 +05:30
Faris Ansari
0fb943181e Merge pull request #15910 from netchampfaris/marketplace-fixes-3
Hub fixes
2018-11-05 19:19:23 +05:30
Faris Ansari
d6b664f7ee fix(hub): Prevent registered actions 2018-11-05 19:18:48 +05:30
rohitwaghchaure
1b2ceadc93 [Fix] Asset date validation (#15887)
* [Fix] Asset date validation

* Update asset.py
2018-11-05 16:04:04 +05:30
lasalesi
32ab3970e1 allow creating sales order on the last valid day of a quotation (#15875) 2018-11-05 16:02:18 +05:30
Frappe PR Bot
3c3b3d830d [Translation] Updated Translations (#15909) 2018-11-05 16:01:47 +05:30
Faris Ansari
0d08da50c6 fix: Refresh PageContainer component based on current route 2018-11-05 15:47:26 +05:30
Nabin Hait
3e6663d47e fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice (#15820) 2018-11-05 14:01:59 +05:30
Faris Ansari
a22e16dbe3 Merge pull request #15892 from netchampfaris/marketplace-fixes-1
fix: Use frappe.utils.make_event_emitter
2018-11-05 13:48:16 +05:30
Ameya Shenoy
8075a576f9 Merge branch 'staging' into develop 2018-11-05 06:53:27 +00:00
Ameya Shenoy
4a6768791b Merge branch 'staging-fixes' into staging 2018-11-05 06:50:34 +00:00
Ameya Shenoy
5ed0257ce2 bumped to version 11.0.3-beta.18 2018-11-05 06:50:33 +00:00
Ameya Shenoy
4a75d58d89 Merge branch 'master' into staging-fixes 2018-11-05 06:45:04 +00:00
Ameya Shenoy
eeb66dfc8e Merge branch 'hotfix' 2018-11-05 06:40:25 +00:00
Ameya Shenoy
59f16bc942 bumped to version 10.1.67 2018-11-05 06:40:25 +00:00
Shreya Shah
6a206225cb Merge pull request #15902 from agritheory/agritheory-restrict_to_domain
Doctypes in domains that are in beta are now restricted to that domain
2018-11-05 10:56:39 +05:30
Tyler Matteson
d14e46ef02 Doctypes in domains that are in beta are now restricted to that domain
non-profit, agriculture, healthcare, hospitality, education

Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
rohitwaghchaure
e77f38e7e2 Merge pull request #15894 from rohitwaghchaure/fix_update_claimed_amount
Column ‘claimed_amount’ cannot be null
2018-11-02 18:14:08 +05:30
Rohit Waghchaure
598d34445f [Fix] Column ‘claimed_amount’ cannot be null 2018-11-02 16:02:33 +05:30
Faris Ansari
68dbf7f99c fix: Use frappe.utils.make_event_emitter 2018-11-02 13:30:51 +05:30
rohitwaghchaure
c1d255e7bc Merge pull request #15882 from Zlash65/fixtds
[Minor] TDS not calculated properly fix
2018-11-02 13:18:09 +05:30
Zarrar
16d45c8e2e safe encode non ascii characters (#15755) 2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9 fixed divided by zero error (#15885) 2018-11-02 12:19:05 +05:30
rohitwaghchaure
dcb71a61ad [Fix] Payment entry not able to submit (#15859) 2018-11-02 12:12:42 +05:30
Charles-Henri Decultot
a89bce0b6e Encoding correction (#15877) 2018-11-01 13:18:49 +05:30
Zlash65
ab9852d31a tds not calculated appropriately 2018-11-01 11:40:15 +05:30
Shreya Shah
9f931780a2 Merge pull request #15868 from ESS-LLP/fix-membership
fix: Membership - allow system users to create membership
2018-11-01 10:54:32 +05:30
Zarrar
92a4ff4e81 Merge pull request #15874 from shreyashah115/portal-fixes
Add overdue status for sales order
2018-11-01 10:46:08 +05:30
Ameya Shenoy
f3f997f232 Merge branch 'staging' into develop 2018-10-31 13:51:52 +00:00
Ameya Shenoy
46e618bc6e Merge branch 'staging-fixes' into staging 2018-10-31 13:51:24 +00:00
Ameya Shenoy
9f20f777b2 bumped to version 11.0.3-beta.17 2018-10-31 13:51:24 +00:00
Ameya Shenoy
961849beb4 Merge branch 'master' into staging-fixes 2018-10-31 13:43:12 +00:00
Ameya Shenoy
3f32218bc0 Merge branch 'hotfix' 2018-10-31 13:35:59 +00:00
Ameya Shenoy
b4bff7e298 bumped to version 10.1.66 2018-10-31 13:35:58 +00:00
Shreya Shah
9660d64146 Merge pull request #15873 from frappe/revert-15870-portal-fixes
Revert "Add overdue status for sales order"
2018-10-31 18:20:56 +05:30
Shreya Shah
e140845399 Revert "Add overdue status for sales order" 2018-10-31 18:20:28 +05:30
Shreya Shah
b95d7ae41b Merge pull request #15870 from shreyashah115/portal-fixes
Add overdue status for sales order
2018-10-31 18:20:18 +05:30
deepeshgarg007
78b273af43 [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793)
* Create bank settings only if bank name is available

* Minor bug-fix in validate_overlap
2018-10-31 18:12:03 +05:30
Shreya Shah
41c5fda196 fix(sms-center): Fix db query (#15774) 2018-10-31 18:04:30 +05:30
Shreya Shah
305c82bd8d fix(medical-record): Remove z-index property (#15790) 2018-10-31 18:02:55 +05:30
rohitwaghchaure
cd11bdfdbb [Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869) 2018-10-31 18:02:00 +05:30
Shreya Shah
0c0e49a421 fix: Fix fieldnames in template (#15860) 2018-10-31 18:00:09 +05:30
rohitwaghchaure
3f398d24f3 [Fix] Precision issue, not able to submit the stock entry (#15863) 2018-10-31 17:58:26 +05:30
Shreya
e3a7c68d4f fix(portal): Add overdue status for sales order 2018-10-31 16:00:27 +05:30
Ranjith
f01bf9048d fix: Membership - allow system users to create membership for existing Members 2018-10-31 14:33:28 +05:30
Ameya Shenoy
df62296a26 Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Ameya Shenoy
71ede099ea Merge branch 'staging-fixes' into staging 2018-10-30 12:53:35 +00:00
Ameya Shenoy
d45fef5423 bumped to version 11.0.3-beta.16 2018-10-30 12:53:35 +00:00
Ameya Shenoy
6178b79555 Merge branch 'master' into staging-fixes 2018-10-30 12:48:45 +00:00
Ameya Shenoy
d9a82738d0 Merge branch 'hotfix' 2018-10-30 12:48:42 +00:00
Ameya Shenoy
1f7a5dcd07 bumped to version 10.1.65 2018-10-30 12:48:42 +00:00
Frappe PR Bot
467ff4f0f2 [Translation] Updated Translations (#15852) 2018-10-30 11:26:11 +05:30
Shreya Shah
452619c668 fix(report): Return if not list (#15849) 2018-10-30 11:26:01 +05:30
rohitwaghchaure
dca4b294bd Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile
[Fix] Delete button not working in POS for mobile
2018-10-29 16:52:34 +05:30
Rohit Waghchaure
152a0c86b0 [Fix] Delete button not working in POS for Ipad 2018-10-29 16:50:18 +05:30
Shreya Shah
85a9b52dfa Merge pull request #15789 from deepeshgarg007/production-analytics
[Bug-fix]Production analytics
2018-10-29 15:49:19 +05:30
Shreya Shah
69bbe1995c Update production_analytics.py 2018-10-29 15:38:21 +05:30
rohitwaghchaure
9d0dba5569 Merge pull request #15851 from frappe/pos-delete-fix
fix: Delete button in POS mobile
2018-10-29 15:19:11 +05:30
deepeshgarg007
7b91f9fa0c Bug Fixes 2018-10-29 15:16:25 +05:30
Faris Ansari
3df1327b94 fix: Delete button in POS mobile
Delete button was covered by page-actions container
2018-10-29 15:15:10 +05:30
Shreya Shah
81cdd967d7 Merge pull request #15794 from ashish-greycube/patch-1
Update employee_advance.py
2018-10-29 14:38:21 +05:30
Ameya Shenoy
6535465ce4 Merge pull request #15838 from codingCoffee/pal
fix(P&L): sql query
2018-10-26 19:22:10 +05:30
Saurabh
6a916943aa fix(P&L): sql query 2018-10-26 13:46:52 +00:00
alsum
27e7c15c16 trigger set_current_asset_value when make asset_value_adjustment from asset form 2018-10-24 13:23:34 +02:00
ashish-greycube
4d47c63db1 Update employee_advance.py
https://github.com/frappe/erpnext/issues/13694
Cancel of  already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null")
Sol: claimed_amount should be flt
2018-10-24 16:35:31 +05:30
Ameya Shenoy
c17a64758d Merge branch 'staging' into develop 2018-10-23 12:58:06 +00:00
Ameya Shenoy
9750d5c184 Merge branch 'staging-fixes' into staging 2018-10-23 12:56:51 +00:00
Ameya Shenoy
6adcfa6032 bumped to version 11.0.3-beta.15 2018-10-23 12:56:51 +00:00
Ameya Shenoy
3643e7b1b4 Merge branch 'master' into staging-fixes 2018-10-23 12:52:48 +00:00
Ameya Shenoy
38eaaade89 Merge branch 'hotfix' 2018-10-23 12:52:46 +00:00
Ameya Shenoy
2a98e59bd4 bumped to version 10.1.64 2018-10-23 12:52:46 +00:00
Ameya Shenoy
03348364e9 Merge pull request #15739 from kennethsequeira/hotfix
Fix for "Improve this page" incorrect link generated in v10 sites
2018-10-23 18:05:25 +05:30
Ameya Shenoy
7658bdc00a Merge branch 'staging' into develop 2018-10-23 08:06:15 +00:00
Ameya Shenoy
881bb4646b Merge branch 'staging-fixes' into staging 2018-10-23 08:05:33 +00:00
Ameya Shenoy
4293d17602 bumped to version 11.0.3-beta.14 2018-10-23 08:05:33 +00:00
Ameya Shenoy
ca66c7ba14 Merge branch 'master' into staging-fixes 2018-10-23 08:01:13 +00:00
Ameya Shenoy
83fd31973f Merge branch 'hotfix' 2018-10-23 07:58:12 +00:00
Ameya Shenoy
ac64b39562 bumped to version 10.1.63 2018-10-23 07:58:11 +00:00
Ameya Shenoy
c73c576536 Merge pull request #15759 from codingCoffee/salesperson
fix(): fetch correct warehouse for item in report
2018-10-23 13:25:42 +05:30
Shreya Shah
669c5d0298 Merge pull request #15724 from shreyashah115/fix-leave
Do not consider current leave application while submitting leave
2018-10-23 12:31:02 +05:30
Faris Ansari
d3e3c1ba72 Merge pull request #15768 from rohitwaghchaure/market_place_settings_error
[Fix] Marketplace settings permission error
2018-10-23 12:07:21 +05:30
Rohit Waghchaure
55416e08f1 [Fix] Marketplace setting permission error 2018-10-23 11:52:06 +05:30
Shreya
1b105e2575 Add test case 2018-10-23 11:45:57 +05:30
Shreya
60d8a0da1e fix(leave-status): Do not consider current leave application while submitting 2018-10-23 11:45:57 +05:30
Shreya Shah
9db75ecde2 Merge pull request #15766 from Zlash65/fix-mod
[Minor] Travis fix
2018-10-23 11:44:33 +05:30
Zlash65
635d4dbebe subscriber deprecated test case fixes 2018-10-23 11:00:19 +05:30
rohitwaghchaure
cf076f4692 Merge pull request #15753 from Zlash65/fix-mod
[Minor] Field name fix to fetch Supplier
2018-10-23 09:45:39 +05:30
rohitwaghchaure
034429b34d Merge pull request #15756 from rohitwaghchaure/fixed_allow_edit_rate
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-23 09:43:57 +05:30
Ameya Shenoy
a0e533ede5 Merge branch 'master' into staging-fixes 2018-10-22 10:37:14 +00:00
Ameya Shenoy
874866e9f9 Merge branch 'hotfix' 2018-10-22 10:34:35 +00:00
Ameya Shenoy
c365ce8f21 bumped to version 10.1.62 2018-10-22 10:34:35 +00:00
Ameya Shenoy
3a11f34355 fix(): fetch correct warehouse for item in report
Fix 'Sales Person-wise Transaction Summary' Report by fetching the
correct Warehouse for the Item fron the respective, Sales Order/Sales
Invoice/ Delivery Note
2018-10-22 10:15:07 +00:00
Nabin Hait
91eac5a7cf fix(report): Optimization for financial statements 2018-10-22 15:05:40 +05:30
Rohit Waghchaure
aef7a6ec44 [Fix] User able to edit the rate in offline POS even if it has no permissions 2018-10-22 13:51:32 +05:30
Ranjith Kurungadam
ac6e3a69f9 fix: Serial No- allow editing SO, track changes (#15741) 2018-10-22 12:06:54 +05:30
Zlash65
473437931c field name fix 2018-10-22 11:22:12 +05:30
Ameya Shenoy
c1231d65fd Merge branch 'staging' into develop 2018-10-19 13:27:07 +00:00
Ameya Shenoy
4215b85e46 Merge branch 'staging-fixes' into staging 2018-10-19 12:56:48 +00:00
Ameya Shenoy
7e97230c92 bumped to version 11.0.3-beta.13 2018-10-19 12:56:48 +00:00
Ameya Shenoy
bbfdc13ab7 Merge branch 'master' into staging-fixes 2018-10-19 12:48:18 +00:00
Ameya Shenoy
6192d24235 Merge branch 'hotfix' 2018-10-19 12:48:17 +00:00
Ameya Shenoy
24fe7286fc bumped to version 10.1.61 2018-10-19 12:48:16 +00:00
Nabin Hait
5d1171678e fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743)
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled

* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
2018-10-19 18:03:13 +05:30
Kenneth Sequeira
991c121b57 added source link for ERPNext docs 2018-10-19 14:31:21 +05:30
Kenneth Sequeira
23ec18e3e4 added docs_app variable to point docs to foundation app 2018-10-19 03:28:12 +05:30
Saif
b4cf72c770 Adding "Include UOM" in Reports with Qty and Rates (#15541)
* Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty

* Add columns in result list-of-lists instead of converting reports to list-of-dicts

* For requested changes
-Merged conversion factor query with item detail queries
-Ensuring snail_case
-Made columns consistently list-of-dicts
2018-10-18 17:59:47 +05:30
Saif
3c9155e406 [Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532)
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched

* Prevent net_rate from becoming NaN

* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
deepeshgarg007
25edac451d Production Analytics Query Report (#15673)
* Production Analytics Query Report

* Changes in production analytics report

* Updated json file and other changes
2018-10-18 17:43:41 +05:30
Raffael Meyer
25e9db5e81 Do not display gender for companies (#15728) 2018-10-18 16:49:49 +05:30
Nabin Hait
500ddc94c7 fix(gle): GL Entry for invoices before introduction of rounding_adjustment (#15732) 2018-10-18 16:48:28 +05:30
Charles-Henri Decultot
7a7615ed66 Safe encode payer name (#15726) 2018-10-18 12:28:06 +05:30
Aditya Hase
007fbfbfb7 [Feature] ERPNext Quickbooks Migrator (#15718)
* Create QuickBooks Connector Single DocType

* Create interface for user authorization and obtaining authorization code

* Obtain Access token using authorization code

* Fetch a random customer

* Schedule fetching as a background job

* Save fetched customer

* Fetch all customers, take care of pagination

* Save fetched customers

* Create a custom field for storing Quickbooks ID

* Don't save already saved customers

* Commit every successful insert

* No need of allow_guest=True

* Fetch Items as well

* Store Customer Addresses as well.

* Remove redundant custom field creation code

* Stupid refactoring

* Some more refactoring

* Fetch and Save Suppliers as well

* Save accounts. Really a hack as of now.

* Fetch and save invoices, Take care of child items as well

* Fetch Taxes as well

* Set currency on Sales Invoice

* Correctly Link Items, Handle markups

* Don't enqueue, Need to wait forever for testing sometimes

* Set margin rate correctly

* Correct fieldname is tax_amount not amount

* Fetch with maximum possible batch size

* Don't print unnecessary info

* Fetch Journal Entries

* Fetch Purchase Invoices (Bill)

* Don't perform reauthentication if you already have an access_token

* Don't need those print statements anymore

* Refresh access_token if request fails

* Fetch Payment Entry(Payment)

* Map QB items to ERPNext rather than other way around

* Don't need a huge comment block as of now

* Fetch Payment Entries against Purchase Invoices (BillPayment)

* Rename Quickbooks Connector to Migrator

* Make oauth settings configurable

* Make company configurable

* Make default accounts configurable

* Fetch accounts and other masters separately

* Show realtime progress

* Check if entries exist before attempting insert

* Suppress other annoying messages

* Tracebacks are good for health

* Don't want rounded total

* Don't call fetch after authorization (Need to somehow separate these)

* Make credit_to account payable

* When generating payment entry mention bank_account as well

* Cleanup

* Add custom buttons and reflect current state in form ui

* Show necessary fields on form depending on the current state

* Cleanup

* Minor fixes

* Set income and expense account on items.

* Set currency for Account.

* Stupid VSCode

* Remove redundant code

* Check for existing Payment and BillPayment correctly

* Cache API response for faster development

* Don't maintain stock for now, Seems to solve the issue with 'Stock Received but not billed'

* Cleanup

* Add methods to remove inserted data completely (Development)

* Don't commit in every iteration

* Set account head based on TaxRate in Sales Invoice

* Fetch and cache TaxCode

* Add methods to fetch TaxCode and TaxRate from cache

* Set item wise tax breakup, Don't use Actual Tax

* Use both TaxRateLists

* Set Itemwise tax on Purchase Invoice as well

* Set bank_amount, while creating payment entries

* Remove print statements

* Add Shipping in taxes child table of Sales Invoice

* Set posting date on Payment Entries against Invoices

* Fetch and save expenses as Journal Entries

* Fetch and save Deposits as Journal Entries

* Fetch and Save Credit and Debit Notes

* Fetch and save SalesReceipt

* Record Shipping as Item instead of Tax

* Minor Fixes

* Fetch Advance Payments

* Set account_type during Account creation

* Choose receivable account in Invoice based on currency

* Remove receivable_account field

* Account type is already set during account creation

* Set receivable account based on currency in Sales Receipt and Credit Memo

* Set receivable account on Customer

* Save Company Preferences

* Set shipping_account based on company preferences

* Set cost center in Sales Invoice Items and Taxes

* Make Account name unique in case of duplicate account name

* Fetch and Save TaxPayment as Journal Entry

* Record UndepositedFunds Account in cache if found

* Credit UndepositedFunds account when mentioned in Deposit

* Debit Cashback account as well if mentioned in Deposit

* Set currency conversion rate

* Set is_group field correctly for accounts

* Preserve account hierarchy

* Use quickbooks_id and company together for filtering

* Make new custom field 'company' on Supplier Customer and Item

* Use comapny field for filtering Customer, Item, Supplier

* Shipping Account is only available if shipping is enabled for comapny

* Invoice might not have TxnTaxDetail.TaxLine

* Lookup TaxRate account correctly

* TaxCode might not have SalesTaxRateList PurchaseTaxRateList or Both

* TaxCode might not have SalesTaxRateList and PurchaseTaxRateList

* Remove unnecessary UI elements

* Allow multiple companies to have customers with same name

* Refactor account_type

* Create a leaf an account for every group account

* Item and Tax list creation needs more information

* Supports discount in Invoice

* Save Invoice as Journal Entry when itemwise details are unavailable

* Credit=True represents a refund rather than charge

* Mode of Payment not synced, setting as Cash for now

* Tax code may also be set for an entire invoice

* Fetch General Ledger Report correctly

* Refactor fetching entries from General Ledger Report

* Tax Payment is the same as Sales Tax Payment and Purchase Tax Payment

* append_number_if_name_exists is stupid, Reimplementing

* Don't guess credit/debit for Tax Payment and Advanced Payment

* Bill Payment shouldn't assume full payment

* Save Payment as Journal Entry

* Make Client ID and Client Secret Default

* Remove unused python imports

* removed are_accounts_synced()

* Don't store translated values in database

* Endpoints as a field

* Major refactor - functions to methods

* Major Refactor Functions to Methods

* Major Refactor Fix Stuff

* Minor Changes

* Save Refund As well

* Minor Refactor (SI varations to SI, PI variations to PI)

* Record Inventory Qty Adjust Entries

* QBM Final Touches

* Make changes suggested in review
2018-10-17 17:50:00 +05:30
rohitwaghchaure
e2afbb7abe Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix
[For staging-fixes] Fixed PDC data in AR/AP report
2018-10-17 15:57:28 +05:30
Ameya Shenoy
d1c467bcf5 Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
Ameya Shenoy
961b7dee9d Merge branch 'staging-fixes' into staging 2018-10-17 09:44:11 +00:00
Ameya Shenoy
a7a32d7400 bumped to version 11.0.3-beta.12 2018-10-17 09:44:11 +00:00
Ameya Shenoy
77b60928bf Merge branch 'master' into staging-fixes 2018-10-17 09:39:31 +00:00
Ameya Shenoy
bbd8b04012 Merge branch 'hotfix' 2018-10-17 09:04:11 +00:00
Ameya Shenoy
bb1b6b42e2 bumped to version 10.1.60 2018-10-17 09:04:11 +00:00
Ameya Shenoy
4fdbff7456 Merge pull request #15547 from Zlash65/demo-refactor
Demo data refactor
2018-10-16 17:34:09 +05:30
deepeshgarg007
0cbb9b54fa Deprecating subscriber doctype (#15695)
* Depricating subscriber doctype

* Removed naming series
2018-10-16 14:39:16 +05:30
Shreya Shah
8e71074e1c fix(report): Add column for Item Name (#15702) 2018-10-16 14:36:49 +05:30
Shreya Shah
e45868a3c6 fix(discount-amount): Print hide discount_amount if print without amount (#15705) 2018-10-16 14:34:56 +05:30
Shreya Shah
ff0deedca9 fix(discount-amount): Print hide discount_amount if print without amount (#15704) 2018-10-16 14:34:30 +05:30
Shreya Shah
22731e39ba Merge pull request #15376 from jodeq/show_project-attachments-in-portal
[Proposal] Show project attachments in portal view
2018-10-16 14:29:51 +05:30
Shreya Shah
bfb88f7839 Merge pull request #15701 from shreyashah115/item-stock
Add column for Item Name in Item Price Stock report
2018-10-16 14:22:46 +05:30
Shreya
82660913a5 fix(report): Add column for Item Name 2018-10-16 12:15:56 +05:30
Shreya
8aca56836b fix(margin): Make user avatar display in line 2018-10-16 12:00:46 +05:30
rohitwaghchaure
19be730b9c Merge pull request #15700 from joeirimpan/staging-fixes
feat: Add provision for prebilled subscription invoices
2018-10-16 11:36:29 +05:30
rohitwaghchaure
b7debc8573 Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix
Fixed PDC data in AR/AP report
2018-10-16 11:27:53 +05:30
rohitwaghchaure
a5a926967b Update accounts_receivable.py 2018-10-16 11:27:23 +05:30
Joe Paul
666e6e665b feat: Add provision for prebilled subscription invoices
(cherry picked from commit db33e6304d)
2018-10-16 10:17:40 +05:30
deepeshgarg007
4bb90add1d Currency symbol bug fix (#15698) 2018-10-15 19:07:49 +05:30
Nabin Hait
44ec05f79b fix(bom): deadlock issue via bom replace tool (#15694) 2018-10-15 18:56:16 +05:30
Charles-Henri Decultot
615571dd21 Add safe decode for payer name (#15692) 2018-10-15 18:26:02 +05:30
Bibin
7844b79274 [Bug-Fix] accounts_receivable.html (#15688)
* Update accounts_receivable.html

In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue

* Update accounts_receivable.html
2018-10-15 18:25:26 +05:30
deepeshgarg007
7c443264a4 Currency symbol bug fix (#15690) 2018-10-15 18:22:28 +05:30
JodeQ
10dfd4a48f Show project attachments in portal view 2018-10-15 14:28:27 +02:00
Ameya Shenoy
606c504f28 Merge branch 'staging' into develop 2018-10-15 12:25:03 +00:00
Ameya Shenoy
3185b37360 Merge branch 'staging-fixes' into staging 2018-10-15 12:24:12 +00:00
Ameya Shenoy
8d0195246d bumped to version 11.0.3-beta.11 2018-10-15 12:24:12 +00:00
Ameya Shenoy
4fa58359c8 Merge pull request #15689 from codingCoffee/pat
fix(patch): reload patient
2018-10-15 17:49:42 +05:30
Ameya Shenoy
102eb998ac fix(patch): reload healthacre doctypes
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-15 17:40:02 +05:30
Nabin Hait
3c29967d27 Fixed merge conflict 2018-10-15 15:43:21 +05:30
Nabin Hait
ea75295bb3 Merge branch 'hotfix' 2018-10-15 15:41:25 +05:30
Nabin Hait
d2c643eb0b bumped to version 10.1.59 2018-10-15 16:11:25 +06:00
rohitwaghchaure
94fcb0e9f9 [Enhance] Add user image in the employee from the user (#15680) 2018-10-15 14:57:46 +05:30
Frappe PR Bot
be923a8995 [Translation] Updated Translations (#15685) 2018-10-15 14:55:04 +05:30
Jamsheer
2a966f26af fix: patch - change healthcare desktop icons (#15683) 2018-10-15 14:54:29 +05:30
Ranjith Kurungadam
741bd29b74 fix: Patient Appointment Calendar (#15684) 2018-10-15 14:52:38 +05:30
rohitwaghchaure
0d2a4c6a59 [Fix] TDS Payable Monthly report is not working (#15666) 2018-10-15 11:09:17 +05:30
deepeshgarg007
42510a411f [Bug-Fix]V11 Accounts Receivable print showing zero values (#15667)
* Bug Fix

* Print report bug fixes
2018-10-15 11:08:04 +05:30
rohitwaghchaure
3362d6b948 [Fix] Precision issue in the expense claim (#15678) 2018-10-15 11:07:13 +05:30
Chinmay Pai
905c0ff978 File api (#15637)
* file-api: major refactor

migrate from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* file-api: migrate to file-api

remove file_manager stuff and migrate to file-api

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-10-15 10:38:53 +05:30
Mangesh-Khairnar
8c62ab4af0 [Enhancement] Email birthday reminder (#15559)
* Update hooks.py

* modified date for reload_doc (#15027)

* Single email for multiple birthdays and test
2018-10-11 17:06:10 +05:30
Shreya Shah
314c97cbf1 Fix for supplier quotation (#15659) 2018-10-11 16:59:40 +05:30
Alchez
a16f0f4423 fix(item_defaults): handle multiple item defaults for a company (#15634) 2018-10-11 16:56:46 +05:30
Charles-Henri Decultot
64b6421fce Add event in transaction base correction (#15631) 2018-10-11 16:54:26 +05:30
Charles-Henri Decultot
6c743bebf2 Check for prefix before return EcritureNum (#15629) 2018-10-11 16:51:29 +05:30
Charles-Henri Decultot
50447b195d Compatibility with Py2 (#15653) 2018-10-11 16:48:38 +05:30
Shreya Shah
e9890a3ec8 fix(patch): Check if meta object has naming_series field (#15651) 2018-10-11 16:28:59 +05:30
Faris Ansari
4833b4c274 fix: Default Series in naming series patch (#15656) 2018-10-11 16:27:05 +05:30
Stavros Anastasiadis
a398d6bf4f Allow Same Item Multiple Items (#15657) 2018-10-11 16:25:37 +05:30
Stavros Anastasiadis
66922b9c8e Allow Same Item Multiple Items (#15657) 2018-10-11 16:20:30 +05:30
Ameya Shenoy
f90af80344 Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
Ameya Shenoy
dc279ded15 Merge branch 'staging-fixes' into staging 2018-10-11 06:58:13 +00:00
Ameya Shenoy
d791af8331 bumped to version 11.0.3-beta.10 2018-10-11 06:58:13 +00:00
rohitwaghchaure
b1241caf48 Merge pull request #15650 from rohitwaghchaure/fix_gst_state_issue
[Fix] Nontype object has no attribute gst_state
2018-10-11 10:53:46 +05:30
Rohit Waghchaure
b6a735e021 [Fix] Nontype object has no attribute gst_state 2018-10-11 10:40:34 +05:30
Shreya Shah
785f1aa96d fix(print): Update idx if grouping same items (#15647) 2018-10-11 10:14:25 +05:30
Shreya Shah
2291323c65 fix(shipping-address-display): Fetch shipping address display as per the shipping address (#15643) 2018-10-11 10:13:27 +05:30
deepeshgarg007
1cb1074f6b Bug Fix (#15640) 2018-10-10 16:15:30 +05:30
Sagar Vora
d92f3ac480 Fix 'transporter info' section in Delivery Note (#15565)
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
2018-10-10 14:51:26 +05:30
Shreya Shah
dd87e0f1e2 fix(leave-type): Drop column max_days_allowed (#15642) 2018-10-10 14:48:49 +05:30
rohitwaghchaure
4cfff7829b Added validation to check duplicate student leave application (#15636) 2018-10-10 14:47:48 +05:30
Shreya Shah
3855156b7d fix(project): If Project has no Tasks, let the status be set as Completed (#15639) 2018-10-10 14:45:40 +05:30
Jamsheer
14c6ab0ee9 [fix] Healthcare field and desktop icon (#15638)
* Test Inpatient Record - Fix

* Test Inpatient Record - Fix

* Healthcare - Patch rename_healthcare_doctype_and_fields - Updated

* Healthcare - Desktop Icons - Updated

* Healthcare - Patch change  in healthcare desktop icons

* Healthcare Util - fix - appointments valid in fee validity

* Healthcare Settings - field label change

* Patient allow rename

* fix: remove unused variable
2018-10-10 14:44:36 +05:30
Frappe PR Bot
3f320676f6 [Translation] Updated Translations (#15620) 2018-10-10 14:44:12 +05:30
Zlash65
6a8957b430 item data updated with retail data 2018-10-10 14:28:17 +05:30
Zlash65
62592d3c44 setup data for retail added 2018-10-10 14:28:17 +05:30
Zlash65
fd9c451909 company name picked up dynamically, domainification 2018-10-10 14:28:17 +05:30
Zlash65
d1fbaf8f32 custom field added for item - domainification, password changed 2018-10-10 14:28:17 +05:30
Zlash65
275ef826a4 codacy fixes 2018-10-10 14:28:17 +05:30
Zlash65
8b1133cb24 item data fix for default supplier, exception handling for purchase order 2018-10-10 14:28:17 +05:30
Zlash65
d080a17961 minor random trigger changes and exception handling 2018-10-10 14:28:16 +05:30
Zlash65
e64dcfc2f9 timesheet logic changed to job card 2018-10-10 14:28:16 +05:30
Zlash65
e895845ae1 import fix 2018-10-10 14:28:16 +05:30
Zlash65
523f77e82b make_rm_stock_entry fix 2018-10-10 14:28:16 +05:30
Zlash65
dcf7401104 random time fix and other minor fixes 2018-10-10 14:28:16 +05:30
Zlash65
143d4da901 Production Plan fix 2018-10-10 14:28:16 +05:30
Zlash65
c24d2fdf6c setup leave & expense approver for each department
- assign approver in expense claim
2018-10-10 14:28:16 +05:30
Zlash65
a259466643 add relevant department to employees 2018-10-10 14:28:16 +05:30
Zlash65
0309bbee30 function call requires company as parameter 2018-10-10 14:28:16 +05:30
Zlash65
796bffbee1 fix payroll and stock related data 2018-10-10 14:28:16 +05:30
Zlash65
4c07970545 remove user permission from HR Manager user 2018-10-10 14:28:16 +05:30
Zlash65
fa7c8a9f8b update employee and user records 2018-10-10 14:28:16 +05:30
Saurabh
99c064305f Merge branch 'master' into staging-fixes 2018-10-09 17:55:33 +05:30
Saurabh
75c1682e61 Merge branch 'hotfix' 2018-10-09 17:55:32 +05:30
Saurabh
2dc8972794 bumped to version 10.1.58 2018-10-09 18:25:32 +06:00
Saurabh
f786eccdf9 Merge pull request #15633 from Zlash65/setup-fix
[Minor] Setup Wizard failing fix
2018-10-09 17:49:54 +05:30
Zlash65
a1036ad50b setup wizard failing fix 2018-10-09 17:38:28 +05:30
Zarrar
098d88ee0a columns without fieldname's data not shown (#15619) 2018-10-08 18:34:23 +05:30
Shreya Shah
8a4bcefec4 fix(accounts-receivable): Column values in Print and PDF (#15621) 2018-10-08 18:34:01 +05:30
Shreya Shah
5b34d00bc0 fix(accounts-receivable): Column values in Print and PDF (#15622) 2018-10-08 18:20:51 +05:30
Nabin Hait
d2c5b50842 fix(warehouse-account): get warehouse account map fallback handling (#15625)
* fix(warehouse-account): get warehouse account map fallback handling

* fix: import issue
2018-10-08 18:19:53 +05:30
Ameya Shenoy
f5d3ce8846 Merge branch 'staging' into develop 2018-10-08 09:44:34 +00:00
Ameya Shenoy
cf91f34ffa Merge branch 'staging-fixes' into staging 2018-10-08 09:43:48 +00:00
Ameya Shenoy
563b1d153b bumped to version 11.0.3-beta.9 2018-10-08 09:43:48 +00:00
Ameya Shenoy
ecba14e6cf Merge branch 'master' into staging-fixes 2018-10-08 09:39:49 +00:00
Ameya Shenoy
ee3b788024 Merge branch 'hotfix' 2018-10-08 09:37:37 +00:00
Ameya Shenoy
b509b06edf bumped to version 10.1.57 2018-10-08 09:37:37 +00:00
Zarrar
87441bf62e columns without fieldname's data not shown (#15618) 2018-10-08 14:34:34 +05:30
Zarrar
5fcccda883 [Minor] Supplier Quotation (#15578)
* throw meaningful error if RFQ does not have selected supplier

* Update supplier_quotation.py

* codacy fix
2018-10-08 14:30:53 +05:30
Shreya Shah
4fb9230d16 Add missing method link_to_mrs to buying.js (#15613) 2018-10-08 14:18:03 +05:30
Shreya Shah
95d93913ce fix(link_to_mr): Add missing method to buying.js (#15616) 2018-10-08 14:17:37 +05:30
Shreya Shah
37d3686372 fix(setup_taxes): Pop if frappe.message_log (#15615) 2018-10-08 14:17:16 +05:30
Ameya Shenoy
de5206ff43 Merge branch 'staging' into develop 2018-10-08 07:28:24 +00:00
Ameya Shenoy
8cafb5fbbb Merge branch 'staging-fixes' into staging 2018-10-08 07:27:35 +00:00
Ameya Shenoy
0bd254b02b bumped to version 11.0.3-beta.8 2018-10-08 07:27:35 +00:00
rohitwaghchaure
5e466bace4 Removed update_job_card_reference method (#15614) 2018-10-08 12:36:45 +05:30
Shreya Shah
c2857fd2cc fix(setup_taxes): Pop if frappe.message_log (#15611) 2018-10-08 12:35:18 +05:30
Jamsheer
063cf9c582 Jam staging fixes (#15608)
* Test Inpatient Record - Fix

* Test Inpatient Record - Fix
2018-10-08 10:48:42 +05:30
Ameya Shenoy
8bef1d8506 Merge branch 'staging' into develop 2018-10-07 08:00:07 +00:00
Ameya Shenoy
36be62b927 Merge branch 'staging-fixes' into staging 2018-10-07 07:59:34 +00:00
Ameya Shenoy
cfdd629fd7 bumped to version 11.0.3-beta.7 2018-10-07 07:59:34 +00:00
Ameya Shenoy
272956980d Merge pull request #15606 from codingCoffee/abc
fix: make location from warehouse patch
2018-10-07 13:25:05 +05:30
Ameya Shenoy
f7b5b7beb4 fix: make location from warehouse patch
- optimization by preventing patch execution if Asset doesn't exist
2018-10-07 13:08:00 +05:30
Ameya Shenoy
f174c95d80 Merge branch 'staging' into develop 2018-10-07 06:24:12 +00:00
Ameya Shenoy
39903647ae Merge branch 'staging-fixes' into staging 2018-10-07 06:23:22 +00:00
Ameya Shenoy
cd9be8f0a6 bumped to version 11.0.3-beta.6 2018-10-07 06:23:22 +00:00
Shreya Shah
5615cb4735 Set default only if customer_address not found (#15605)
* Set default only if customer_address not found

* Similar fix for Purchase Invoice and shipping_address
2018-10-07 11:42:07 +05:30
Shreya Shah
e7e269d4a4 [Error] Display appropriate msg if company is different for TDS (#15601)
* fix(tds): Display appropriate msg if company is different

* Update tax_withholding_category.py
2018-10-06 17:56:21 +05:30
Ameya Shenoy
b8c1897a80 Merge pull request #15603 from Zlash65/rectify
[Minor] Deferred Expense
2018-10-06 16:43:22 +05:30
Zlash65
58a080a1b1 add voucher detail no while creating gl entry 2018-10-06 16:34:58 +05:30
Zarrar
bc7a2c5cb3 Merge pull request #15602 from Zlash65/fix-mod
[Minor] Deferred Expense
2018-10-06 16:21:06 +05:30
Zlash65
b4aeee776a add voucher detail no while creating gl entry 2018-10-06 16:17:12 +05:30
Ameya Shenoy
1d5dc73dfd Merge branch 'staging' into develop 2018-10-05 09:10:30 +00:00
Ameya Shenoy
29fe8ce114 Merge branch 'staging-fixes' into staging 2018-10-05 09:09:53 +00:00
Ameya Shenoy
538678afc4 bumped to version 11.0.3-beta.5 2018-10-05 09:09:53 +00:00
Ameya Shenoy
ad908779be Merge branch 'master' into staging-fixes 2018-10-05 08:54:58 +00:00
Ameya Shenoy
5eafa5a487 Merge branch 'hotfix' 2018-10-05 08:54:46 +00:00
Ameya Shenoy
97dbb4d125 bumped to version 10.1.56 2018-10-05 08:54:46 +00:00
Shreya Shah
5cff01634e Merge pull request #15593 from Zlash65/fix-mod
[Minor] Item master - get_query for deferred accounts
2018-10-05 14:14:46 +05:30
Shreya Shah
32206029ac Fix Codacy 2018-10-05 14:14:33 +05:30
Shreya Shah
deb9f0e03c Merge pull request #15594 from shreyashah115/tds-report
Handle IndexError if no data found
2018-10-05 14:11:43 +05:30
Shreya Shah
db5ffce742 Merge pull request #15592 from shreyashah115/jv
Allow Reverse JV for all submitted docs
2018-10-05 13:33:11 +05:30
Shreya
0d7bd43367 Handle IndexError if no data found 2018-10-05 13:22:09 +05:30
Zlash65
2123b97d31 add get_query for revenue and expense account 2018-10-05 12:26:32 +05:30
Shreya
4f5214a136 Allow reverse jv for all submitted docs 2018-10-05 12:19:09 +05:30
Saif
00a16a9337 set_item_default was referencing a variable company of "company" (#15576) 2018-10-05 11:54:03 +05:30
Shreya Shah
17ac38ff29 Enable save before saving to update form after save (#15579) 2018-10-05 11:51:13 +05:30
Jamsheer
be6e426fe0 Healthcare Service Unit - added company abbr as suffix (#15590) 2018-10-05 11:38:15 +05:30
Ranjith Kurungadam
dc2bab2b72 fix healthcare patch (#15584) 2018-10-05 11:36:58 +05:30
Valmik
4c61861163 Add Delivery Trip to Delivery Note dashboard (#15587) 2018-10-05 11:36:31 +05:30
Saif
4faea037bb Remove Test Letter Head from GSTR-1 (#15591) 2018-10-05 11:35:01 +05:30
Ameya Shenoy
06bd6ee1b8 Merge branch 'staging' into develop 2018-10-04 13:16:31 +00:00
Ameya Shenoy
c4ebbd1322 Merge branch 'staging-fixes' into staging 2018-10-04 13:14:29 +00:00
Ameya Shenoy
2291558c5f bumped to version 11.0.3-beta.4 2018-10-04 13:14:29 +00:00
Ameya Shenoy
36a778a289 Merge pull request #15588 from codingCoffee/lint
fix(linting): indentation fix
2018-10-04 17:50:10 +05:30
Ameya Shenoy
6005a1eb89 fix(linting): indentation fix
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-04 17:40:39 +05:30
rohitwaghchaure
d69dc954c7 Merge pull request #15580 from sagarvora/fix-TabError
fix TabError in install_fixtures.py
2018-10-04 17:22:44 +05:30
Ameya Shenoy
da10f6ebd8 Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Ameya Shenoy
c6eac7c60b Merge branch 'staging-fixes' into staging 2018-10-04 11:42:56 +00:00
Ameya Shenoy
5ae344593e bumped to version 11.0.3-beta.3 2018-10-04 11:42:56 +00:00
Ameya Shenoy
6dc4cdca3a Merge pull request #15585 from rohitwaghchaure/fix_asset_depreciation_ledger_report
Fix issue after merging hotfix into staging-fixes
2018-10-04 16:47:43 +05:30
Rohit Waghchaure
18678696db Fix issue after merging hotfix into staging-fixes 2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f Merge branch 'master' into staging-fixes 2018-10-04 09:25:07 +00:00
Ameya Shenoy
65652071ff Merge branch 'hotfix' 2018-10-04 09:11:50 +00:00
Ameya Shenoy
79dc8ac9cc bumped to version 10.1.55 2018-10-04 09:11:50 +00:00
rohitwaghchaure
8b42bf57cd Merge pull request #15581 from rohitwaghchaure/work_order_item_has_no
[Fix] WorkOrderItem object has no attribute operation
2018-10-04 13:27:00 +05:30
Rohit Waghchaure
9f2859701e [Fix] WorkOrderItem object has no attribute operation 2018-10-04 13:25:49 +05:30
Sagar Vora
b13b9b4ed3 fix TabError in install_fixtures.py 2018-10-04 11:39:20 +05:30
Zarrar
897d1baf74 Merge pull request #15577 from Zlash65/min-min
[Minor] Purchase Invoice - stop date editable after submit
2018-10-04 09:31:50 +05:30
Zlash65
6e3b1a58a1 service_stop_date should be editable after submit 2018-10-04 09:30:27 +05:30
rohitwaghchaure
36cca6a64e Merge pull request #15574 from Zlash65/min-min
[Minor] Query fix
2018-10-03 18:50:08 +05:30
rohitwaghchaure
f9930ff2a4 Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving
[Fix] Cost center issue
2018-10-03 18:47:28 +05:30
Shreya Shah
3204c94fdd Merge pull request #15570 from shreyashah115/fix-filter-error
[Bug] Item wise sales register filters
2018-10-03 17:38:41 +05:30
Shreya
cbb112f2db Fix filter error 2018-10-03 17:37:40 +05:30
rohitwaghchaure
15e7646edd Merge pull request #15569 from rohitwaghchaure/stock_adjustment_to_cost_of_goods_sold
Book cost of goods sold instead of stock adjustment
2018-10-03 17:36:29 +05:30
Zlash65
9d159ab95e remove db.escape as back tick already used 2018-10-03 17:26:28 +05:30
Rohit Waghchaure
8bf9f377dd [Fix] Cost center issue 2018-10-03 16:59:43 +05:30
Rohit Waghchaure
d1b87ba41c Book cost of goods sold instead of stock adjustment 2018-10-03 16:29:43 +05:30
rohitwaghchaure
d6cacbe565 Merge pull request #15567 from rohitwaghchaure/fix_payment_request
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7 [Fix] Payment request not working 2018-10-03 15:55:51 +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
efd776da46 Events in timeline (#15485)
* Events in timeline

* Namespace correction

* Codacy correction

* Addition of sales partners in participants

* Correct json indent
2018-10-03 10:41:26 +05:30
Sharath C
1c44d93b93 Is frozen and Disabled Columns added to Customer Credit Report (#15560) 2018-10-03 10:41:11 +05:30
Sharath C
c0b684dc30 Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556) 2018-10-03 10:40:22 +05:30
rohitwaghchaure
a5576f5b21 [Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment (#15374) 2018-10-03 10:39:50 +05:30
Faris Ansari
e0a148474d fix: Translation string (#15561) 2018-10-03 10:37:41 +05:30
deepeshgarg007
719701f2a4 Enhancement in Budget Variance and other reports (#15455)
* Enhanced Budget Variance report and added filters and columns in other reports

* Update budget_variance_report.js

* Changes in budget variance report

* Spacing in column names
2018-10-02 12:52:13 +05:30
Shreya Shah
7d115183e4 Improvise and fix indicators in Portal list (#15552) 2018-10-02 12:46:26 +05:30
Charles-Henri Decultot
3b11debcd2 Gocardless correction (#15554) 2018-10-02 12:46:15 +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
Frappe PR Bot
04e4af8d59 [Translation] Updated Translations (#15550) 2018-10-02 11:24:12 +05:30
Shreya Shah
5a2aced586 Merge pull request #15551 from Zlash65/minor-fix
[Minor] Delivery trip test fix
2018-10-02 11:12:51 +05:30
Rushabh Mehta
11e2119670 style(icon): revert to old icon 2018-10-02 11:06:55 +05:30
Zlash65
6a5e6ed2ff delivery trip notification to customer fix 2018-10-01 17:28:42 +05:30
Zlash65
9e67b8ec4d fix driver name selection 2018-10-01 17:27:12 +05:30
Zlash65
622bd10946 add date data [mandatory] 2018-10-01 15:37:31 +05:30
rohitwaghchaure
8976ad5ca1 Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue
[Fix] Attendance tool
2018-10-01 15:07:49 +05:30
Rohit Waghchaure
c7f8b82fff [Fix] Attendance tool 2018-10-01 12:30:58 +05:30
rohitwaghchaure
6b62b86bbf Merge pull request #15545 from rohitwaghchaure/salary_slip_not_creating_because_of_the_date_issue
[Fix] Salary slip
2018-10-01 12:03:26 +05:30
Rohit Waghchaure
8fbf856618 [Fix] Salary slip 2018-10-01 12:00:45 +05:30
RicardoJohann
f52ee27d8e fix order labels and add purchase order items overdue (#15436) 2018-10-01 11:27:08 +05:30
Rushabh Mehta
77588ededb version: move to 12.x.x-develop 2018-09-30 23:02:05 +05:30
Saif
90cf2ddc01 Make pricing rule from Supplier and Customer Doc (#15533)
* Make pricing rule from Supplier and Customer Doc

* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +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
Neil Trini Lasrado
55a53e0bec Added ability to have a default return warehouse for Sales Returns (#15491) 2018-09-30 21:22:50 +05:30
Charles-Henri Decultot
4fd7a4e0d7 Lead notes (#15510)
* Notes field in Lead

* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Zarrar
e4c9ac3961 [Minor] Cash Flow report - custom (#15522)
* python 2-3 fix for filter

* pass filters while fetching data to financial statement report
2018-09-30 21:19:01 +05:30
rohitwaghchaure
90f9f9d3d8 Code optimization for deferred revenue (#15527) 2018-09-30 21:12:50 +05:30
Saif
83c89346c3 set_item_default was referencing a variable company of "company" (#15534) 2018-09-30 21:12:25 +05:30
Faris Ansari
6575e52942 fix: Refactor Review Area according to new Text Editor (#15536)
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
rohitwaghchaure
1cf71d96b1 Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11
[Fix] Consolidated Financial Statement report
2018-09-28 17:06:57 +05:30
Rohit Waghchaure
ea0ef95539 [Fix] Consolidated Financial Statement report 2018-09-28 17:05:55 +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
Frappe PR Bot
c1bc8d6066 [Translation] Updated Translations (#15518) 2018-09-27 15:47:52 +05:30
Suraj Shetty
4b404c4f1e Avoid multiple escapes (#15509) 2018-09-27 15:39:34 +05:30
Shreya Shah
0fc4917d81 Merge pull request #15516 from shreyashah115/product-page
Fetch Item Group's name and image on website
2018-09-27 15:12:42 +05:30
Shreya
5c335550e3 Fetch item_group's name and image on website if children 2018-09-27 13:55:59 +05:30
Nabin Hait
7d6d678e8d purchase receipt return entry in dashboard 2018-09-26 19:04:11 +05:30
Nabin Hait
c22ba2ec26 fix(sales return): validation message fix 2018-09-26 18:56:45 +05:30
Nabin Hait
183972f58f fix(stock_entry): allow creating stock entry against work order even if item rate is zero 2018-09-26 18:34:07 +05:30
Suraj Shetty
6ea3de9521 Fix quote issues (#15497)
* Fix quotes issues

* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +05:30
Nabin Hait
1e7c32b909 Payroll fixes and more (#15475)
* fix(payroll): multiple minor fixes related to salary structure

* Added GSTR-1 and GSTR-2 report in Accounts module page

* delete asset movement records on cancellation of Purchase Receipt

* Update consolidated_financial_statement.py

* minor fix

* minor fix

* add filters on item prices report (#15495)
2018-09-26 18:01:00 +05:30
RicardoJohann
171c7d4128 add filters on item prices report (#15495) 2018-09-26 15:58:06 +05:30
deepeshgarg007
c3772f1ac4 minor fix (#15503) 2018-09-26 15:55:43 +05:30
Aditya Hase
e20b7cc47d fix(python3): super() backwards compatibility fix (#15498) 2018-09-26 15:39:02 +05:30
Shreya Shah
352e6494f3 Contact and email fields in Payment Entry (#15490)
* Add contact_person and contact_email fields to Payment Entry

* Minor fix

* Map contact details while making Payment Entry

* Update payment_entry.py
2018-09-26 15:38:34 +05:30
rohitwaghchaure
0cf0ebf08b [Refactored] Asset Depreciation Ledger report based on GL entries (#15415)
* [Refactored] Asset Depreciation Ledger report is based on GL entries

* Provision to make manual JV from the asset if Calculate Depreciation is disabled
2018-09-26 15:24:49 +05:30
Ameya Shenoy
b635a71247 Merge branch 'staging' into develop 2018-09-26 08:53:03 +00:00
Ameya Shenoy
a7ae06eadb Merge branch 'staging-fixes' into staging 2018-09-26 08:52:54 +00:00
Ameya Shenoy
90197dd341 bumped to version 11.0.3-beta.2 2018-09-26 08:52:54 +00:00
Ameya Shenoy
41d1982b90 Merge pull request #15501 from codingCoffee/qwe
fix(multiple): syntax and patch
2018-09-26 14:12:01 +05:30
Ameya Shenoy
12ec142a69 fix(multiple): syntax and patch
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
430c3c88ff Merge branch 'staging' into develop 2018-09-26 07:32:45 +00:00
Ameya Shenoy
47b82789ae Merge branch 'staging-fixes' into staging 2018-09-26 07:32:44 +00:00
Ameya Shenoy
b8a5fb7392 bumped to version 11.0.3 2018-09-26 07:32:44 +00:00
Ameya Shenoy
9d3a97fd15 Merge branch 'master' into staging-fixes 2018-09-26 07:28:53 +00:00
Ameya Shenoy
0ff35a852a Merge branch 'hotfix' 2018-09-26 07:26:49 +00:00
Ameya Shenoy
e04431ea5c bumped to version 10.1.54 2018-09-26 07:26:49 +00:00
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
rohitwaghchaure
fafc277666 [Fix] BOM update tool, too many writes in one request. Please send smaller requests (#15432) 2018-09-25 18:59:20 +05:30
Mohamed_Alsum
b9228fa443 show only submitted salary_structure and leave_policy in Employee Grade app (#15434)
* update staff plan when add or delete job-opening

* Update job_opening.py

* filter default_salary_structure and default_leave_policy

* merge
2018-09-25 18:56:17 +05:30
Aditya Hase
865cb88bdd fix(vscode-intellisense): Make VS Code Intellisense work with ERPNext (#15453)
__init__.py in apps/erpnext directory confuses vs code.

Causing all erpnext dotted paths to need an extra `erpnext.` for 
suggestion and completion to work properly.

This commit fixes this issue.
2018-09-25 18:51:17 +05:30
rohitwaghchaure
fe1e4a41e6 Validate negative stock serial number (#15492) 2018-09-25 18:36:32 +05:30
Faris Ansari
7a8c5b0c2c fix(setup wizard): Validate FY dates (#15473) 2018-09-25 18:34:33 +05:30
Aditya Hase
a38b77cbfd feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion (#15457)
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion

* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Zarrar
b113349f31 minor fix for auto-opt-in for customer (#15483) 2018-09-24 14:30:07 +05:30
Shreya Shah
0a95b31aea Merge pull request #15454 from frappe/coverage-badge
Add coverage badge to README.md
2018-09-24 12:25:06 +05:30
rohitwaghchaure
9c361c38f0 Merge pull request #15482 from rohitwaghchaure/key_error_deferred_revenue
[Fix] Key error while saving sales invoice
2018-09-24 11:59:02 +05:30
Rohit Waghchaure
c699b2a98a [Fix] Key error while saving sales invoice 2018-09-24 11:57:48 +05:30
Ameya Shenoy
2b5bce0c53 Merge branch 'staging-fixes' into staging 2018-09-21 11:04:20 +00:00
Ameya Shenoy
63ebeb432c Merge branch 'staging' into develop 2018-09-21 11:04:20 +00:00
Ameya Shenoy
cdedb27cf0 bumped to version 11.0.2 2018-09-21 11:04:20 +00:00
Suraj Shetty
dabaec0dc5 Revert bench-init changes (#15463)
* Revert bench-init changes

* Fix test

* Remove debug flag
2018-09-21 15:46:44 +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
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287)
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Aditya Hase
40880da280 fix(readme): Add coverage badge 2018-09-20 17:48:35 +05:30
Aditya Hase
6886c47251 fix(style): Center align badges as well 2018-09-20 17:46:53 +05:30
Aditya Hase
99c8fb19f7 fix(style): Put markdown for badges on separate lines 2018-09-20 17:43:04 +05:30
Saurabh
f9b3511880 Merge branch 'staging' into develop 2018-09-20 13:30:47 +05:30
Saurabh
4ae3fb7a87 Merge branch 'staging-fixes' into staging 2018-09-20 13:30:46 +05:30
Saurabh
3ef12bb7f2 bumped to version 11.0.1 2018-09-20 14:00:46 +06:00
Saurabh
75d90b9d8f a[resolved] merge-conflicts 2018-09-20 13:28:23 +05:30
Saurabh
ba5021f3ea a[resolved] merge-conflicts 2018-09-20 13:26:27 +05:30
Saurabh
056ecdca6a Merge branch 'hotfix' 2018-09-20 13:22:36 +05:30
Saurabh
3b281a0a1b bumped to version 10.1.53 2018-09-20 13:52:36 +06:00
Saif
772dc6e82c Various permission fixes (#15448)
* Removed test letter head from Consolidated Financial Statement

* Removed incorrect role permissions
2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75 [Fix] Salary slip is not saving (#15449) 2018-09-20 13:18:49 +05:30
Nabin Hait
8fb04ff1b2 Merge branch 'develop' into staging-fixes 2018-09-20 12:51:26 +05:30
rohitwaghchaure
550fc695f1 [Fix] Precision issue in the accounts receivable report (#15440) 2018-09-19 19:03:40 +05:30
Ameya Shenoy
a2f0b34147 fix(item, item default): changed the modified date (#15442)
The patch move_item_defaults_to_child_table_for_multicompany used to
fail since the doctypes Item and Item Defaults weren't reloaded properly

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-19 19:02:52 +05:30
Ameya Shenoy
28fd02e4a8 fix(desktop_icon): remove land unit icon if exists (#15430)
* fix(desktop_icon): remove land unit icon if exists

Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>

* Update remove_land_unit_icon.py
2018-09-19 13:15:52 +05:30
Faris Ansari
2ab6e0e39b fix(translations): Replace translations by keyword with indexed version (#15426)
* fix(translations): Replace translations by keyword with indexed version

Keywords in the translation also gets translated which
results in an error because python cannot find the key

* Update buying_controller.py
2018-09-19 13:13:59 +05:30
Mangesh-Khairnar
0374cc54ba [bug fix]:stopped orders in progress report (#15428) 2018-09-19 13:10:53 +05:30
Nabin Hait
63a58a6752 Merge branch 'staging' into develop 2018-09-18 11:44:42 +05:30
Shreya Shah
13761dde38 [Report] Lead Conversion Time (#15237)
* New Report Lead Conversion Time

* Add column for support tickets and a row for Average
2018-09-18 10:55:35 +05:30
Jamsheer
c07e8e5b0d [Fix] Healthcare minor fixes and field rename (#15413)
* Healthcare practitoiner in Clinical Procedure

* Insert and Update Patient Medical Record from Healthcare DocTypes

* vital signs remove extra columns

* Rename Healthcare Field test_name

* Healthcare Util - get_drugs_to_invoice - fix

* Rename Healthcare Field test_code

* Rename Healthcare Field test_comment

* Rename Healthcare Field test_created

* Rename Healthcare Field test_template

* Rename Healthcare Field test_rate

* Rename Healthcare Field test_description

* Rename Healthcare Field test_groups

* Rename Healthcare Field test_group

* Rename Healthcare Field test_template_type

* Rename Healthcare Field test_uom

* Rename Healthcare Field test_normal_range

* Rename Healthcare Field test_event

* Rename Healthcare Field test_prescription

* Rename Healthcare Field test_particulars

* Patch - Rename healthcare fields

* Sales Invoice - Filter updated for get drugs to invoice

* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f added description field and changed to one filter datepicker (#15425) 2018-09-18 10:48:20 +05:30
JC
31f2c1c3d3 fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ (#15423) 2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816 [FIX] Remove deprecated gen_object.next() function (#15418)
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
2018-09-18 10:42:21 +05:30
Faris Ansari
aa856c474a fix(setup wizard): Validate FY dates (#15419)
- start date should be less than end date
2018-09-18 10:42:04 +05:30
Frappe PR Bot
db8c1f254e [Translation] Updated Translations (#15414) 2018-09-17 16:54:30 +05:30
Charles-Henri Decultot
d6bce7429e Bank statement import corrections (#15405)
* Bank statement import corrections

* Bank statement corrections

* Missing semi-columns
2018-09-17 12:34:11 +05:30
Zarrar
013493de7a lable for discount_amount should be configurable (#15408) 2018-09-17 11:06:49 +05:30
theopen-institute
ba1c0c900d Fix potential crash in payment_entry.py (#15411)
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
2018-09-17 10:59:39 +05:30
Zarrar
e79e4cb9b1 python 2-3 fix, *.keys() return dict_keys object in py3 (#15409) 2018-09-17 10:56:42 +05:30
Zarrar
ada13213c0 reload Patient Appointment doctype with added fields (#15397) 2018-09-14 15:32:04 +05:30
Faris Ansari
31e5431fe0 fix(urljoin): 2 and 3 compatible (#15401) 2018-09-14 15:31:35 +05:30
Zarrar
ae0168f1ba Merge pull request #15399 from Zlash65/mfix
[Minor] Fix Cash Flow report
2018-09-13 12:57:34 +05:30
Zlash65
2619596917 pass filters as parameter 2018-09-13 12:56:04 +05:30
Nabin Hait
5be3968544 fix(add_file): added missing init file 2018-09-12 18:56:15 +05:30
Ameya Shenoy
ecac822613 Merge pull request #15393 from codingCoffee/hub
fix(patch): delete hub documents
2018-09-12 17:50:02 +05:30
Ameya Shenoy
18310c240f fix(patch): delete hub documents
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
2018-09-12 17:46:58 +05:30
Doridel Cahanap
6d0ae5b23b Allow Rename for Custom Tariff (#15389) 2018-09-12 17:13:12 +05:30
Prateeksha Singh
31f2caf51e Merge pull request #15391 from pratu16x7/hub-patch-fix
[patch][fix] remove hub node module removing code
2018-09-12 17:00:12 +05:30
Prateeksha Singh
5ba14fe685 [patch][fix] remove hub node module removing code 2018-09-12 16:59:17 +05:30
Prateeksha Singh
238ed98653 Re-add Hub Node module 2018-09-12 16:36:10 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Saurabh
b3737c812a Merge branch 'hotfix' 2018-09-12 14:44:25 +05:30
Saurabh
6d5a29af6a bumped to version 10.1.52 2018-09-12 15:14:25 +06:00
Zarrar
8dade79002 return blank if no data found (#15387) 2018-09-12 14:24:23 +05:30
Nabin Hait
6173e091ee fix(test): test cases fixed 2018-09-12 11:46:20 +05:30
Zarrar
2b6584a296 accounts table should be mandatory in budget (#15386) 2018-09-12 11:14:24 +05:30
Ahmed Madi
20d8c52d2a Update salary_slip.js (#15200) 2018-09-12 11:02:57 +05:30
Zarrar
ce6a09ca54 [Staging] Stock Reconciliation (#15382)
* optimize query and some fixes

* add get_query to filter warehouses based on company

* minor changes
2018-09-12 10:54:18 +05:30
Nabin Hait
0669a0e18a fix(bank account): import fixed 2018-09-12 10:50:10 +05:30
Nabin Hait
13beb3a008 fix(test): test cases fixed 2018-09-11 19:37:08 +05:30
rohitwaghchaure
713cfc786f [enhance] Payment order (#15056) 2018-09-11 17:40:37 +05:30
Faris Ansari
76b31deda5 Isomorphic marketplace (#15384)
* feat: Make marketplace run on hub server in Guest mode

* fix: Skip page actions on server

* fix: Limit PageContainer to marketplace route

* fix(eslint): Add hub variable to globals
2018-09-11 17:38:31 +05:30
Jamsheer
ede924c4a2 Remove print statements - Healthcare utils (#15363) 2018-09-11 17:32:52 +05:30
Sagar Vora
508189eaea Use default conversion factor if not found in Item (#15369) 2018-09-11 17:22:25 +05:30
Frappe PR Bot
157bdb71ca [Translation] Updated Translations (#15375) 2018-09-11 17:21:39 +05:30
Zarrar
2859300fe6 update modified date to reload doc (#15385) 2018-09-11 17:12:27 +05:30
Nabin Hait
84ddbc0ac9 fix(test): test cases fixed 2018-09-11 17:11:39 +05:30
Nabin Hait
2236f0aef0 fix(test): multiple test cases fixed 2018-09-11 16:50:46 +05:30
Nabin Hait
e11f299b21 Update production_order.py 2018-09-11 11:36:05 +05:30
Nabin Hait
2ce2d2ac02 fix(sales invoice): get value only if field exists 2018-09-10 13:16:25 +05:30
Faris Ansari
20c72f74fc Merge pull request #15356 from adityahase/coverage
feature(coverage): Add test coverage to erpnext travis builds
2018-09-10 12:32:05 +05:30
Faris Ansari
80e6cad7ac Merge pull request #15360 from netchampfaris/marketplaces-fixes
fix(image): New Image component to consistently handle broken images
2018-09-10 12:29:50 +05:30
Zarrar
f42510eb54 Merge pull request #15372 from Zlash65/p-fix
[Minor] Patch Fix
2018-09-10 12:21:02 +05:30
Zlash65
4b0e3741b2 job card patch use orm 2018-09-10 12:18:51 +05:30
Prateeksha Singh
3b3c80e6b5 Merge pull request #15371 from pratu16x7/marketplace-fixes
[hub] add Item Manager permission to Hub Tracked Item
2018-09-10 11:40:42 +05:30
Prateeksha Singh
62f5cd2dee [hub] add Item Manager permission to Hub Tracked Item 2018-09-10 11:39:48 +05:30
Zarrar
68000c66fc check if Data Migration Plan exists before deleting (#15368) 2018-09-09 19:19:13 +05:30
Zarrar
8448d9014d [Fix] Patch fixes (#15350)
* fix typo in fieldname

* fallback for work_order/production_order in timesheet
2018-09-09 19:18:41 +05:30
Ameya Shenoy
8b7fea5a8a Merge pull request #15349 from sagarvora/py3-fixes
[py3] print, StringIO import, and other fixes
2018-09-09 02:25:10 +05:30
Saif Ur Rehman
423549e084 Fixed PDC data in AR/AP report:
-Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared
-Get PDC data from submitted documents only
2018-09-08 15:48:55 +05:00
Faris Ansari
9fb5e1c61b fix(image): New Image component to consistently handle broken images
- psuedo element hack didn't work cross browser
2018-09-07 23:17:29 +05:30
Aditya Hase
c7c87a9297 feature(coverage): Add test coverage to erpnext travis builds 2018-09-07 19:04:10 +05:30
Nabin Hait
73165ebd33 fix(patch): create healthcare patch only if domain activated 2018-09-07 18:44:14 +05:30
Sagar Vora
538100148f [py3] print, StringIO import, and other fixes 2018-09-07 17:59:59 +05:30
Pawan Mehta
2cc7eb1e94 fix default settings (#15345) 2018-09-07 17:59:10 +05:30
Nagarajan
8be8345b65 Stock Projected Qty Item Group Filter (#15340)
* Update stock_projected_qty.js

* Update stock_projected_qty.js

* Update stock_projected_qty.py

* Update stock_projected_qty.js
2018-09-07 16:20:18 +05:30
rohitwaghchaure
3cc77b52e7 [Fix] Timeout error for bom update tool (#15343) 2018-09-07 16:16:58 +05:30
rohitwaghchaure
bd4348db10 [Enhance] Add additional cost of the manufacture stock entry in the project costing (#15341) 2018-09-07 16:16:23 +05:30
Nabin Hait
562d942a7d fix(patch): gst state number in address where number is less than 10 2018-09-07 16:14:44 +05:30
Nabin Hait
431e2e1c6d fix(payment entry): Changed modified 2018-09-07 14:31:34 +05:30
Nabin Hait
399f3ddf82 fix(sales invoice): Restored missing field group_same_items 2018-09-07 14:27:14 +05:30
Nabin Hait
3a342e8d93 fix(report): project filter in financial statement 2018-09-07 14:17:57 +05:30
Zarrar
0d0ebee5dd Merge pull request #15342 from Zlash65/minor
[Minor] Remove console statement
2018-09-07 14:07:08 +05:30
Zlash65
635890187a remove console statement 2018-09-07 14:04:46 +05:30
Zarrar
525a005b78 TDS Monthly report & TDS Computation Summary report (#15204)
* tds computation report added

* tds computation logic added

* minor changes to commonify code

* tds payable monthly report added

* initial logic for monthly tds calculation added

* added field for supplier type and pan

* changes related to pan and entity type

* date filter fix and cleanup
2018-09-07 13:27:10 +05:30
rohitwaghchaure
eef5cda1a9 [Fix] Blanket order issue (#15339) 2018-09-07 13:19:45 +05:30
Zarrar
7737620ff4 [Staging] Patch fix - Shopify Settings (#15338)
* keep enable_shopify in Shopify Settings disabled by default

* patch fix for shopify refactor

* minor fallback fix
2018-09-07 13:19:33 +05:30
Nabin Hait
b479a87031 fix(report): Cost center filters in financial statements and general ledger 2018-09-07 13:17:23 +05:30
rohitwaghchaure
ac696b9497 Merge pull request #15335 from rohitwaghchaure/fixed_patch_job_card
[Fix] Patch
2018-09-06 22:38:55 +05:30
Rohit Waghchaure
e74a39752f [Fix] Patch 2018-09-06 22:38:03 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244)
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
2018-09-06 19:21:48 +05:30
Neil Trini Lasrado
6f77abe0dd Added ability to create a Return Sales Invoice/ Credit Note against a delivery note of type return (#15266)
* Remove make subscription button on delivery note if it is of type returns

* Added 'issue_credit_note' checkbox on delivery note to pass a Sales Inv of type return if checked while creating a return delivery note

* Added logic to auto-create Return Sales Invoice/ Credit Note if issue_credit_note checkbox is checked while return delivey note is submited

* Update delivery_note.py
2018-09-06 19:17:47 +05:30
Alchez
4b290e5561 Map details from Delivery Trip back to Delivery Note (#15261)
* Map details from Delivery Trip back to Delivery Note

* Add pop-up to indicate changed Delivery Notes
2018-09-06 19:08:19 +05:30
Alchez
f2fe0b2194 Keep Delivery Trip stops unique based on their Delivery Notes (#15264)
* Keep Delivery Trip stops unique based on their Delivery Notes

* Pull single row when making a Trip from Delivery Note
2018-09-06 19:05:09 +05:30
Bassam Ramadan
574cd46e41 Adding cashier closing feature (#15273)
* adding cashier closing feature

cashier closing feature has been added as now the cashier can make a
closure to record every thing from his pos as the expenses which has
been paid and the custody which he had at the starting and the amount
which is in his save and the system will record the date and time and
the user and the total net amount automatically which supposed be equal
to all of his sales invoices totals

* add cashier closing link at pos menu

* add cashier closing link to accounts config file

adding cashier closing link at accounts config file to show it at the
accounts module page

* adding more features to cashier closing

adding from time to the cashier closing in case the cashier working more
than one shift also giving him the ability to add the type of payments
to his cashier closure ,
also adding validation to be sure the from time is less than to time.

* Update cashier_closing.py
2018-09-06 19:02:25 +05:30
Nabin Hait
4fd1cebf95 fix(patch): Delete all documents from Hub Node module 2018-09-06 18:53:46 +05:30
Alchez
e52ae4eacb [Fix] 'To Bill' status even if the amount is zero (#14784)
* Fix 'To Bill' status even if the invoice amount is zero

* Modify fix to only apply on Delivery Note documents
2018-09-06 18:27:06 +05:30
Faris Ansari
b892cc8b02 fix(item): Remove Hub Category field (#15331) 2018-09-06 18:02:48 +05:30
Zarrar
203baa9a3a update modified date to load blanket order field (#15332) 2018-09-06 17:46:11 +05:30
Nabin Hait
a2a6568b7e fix(reports): Made gstr1 ready for govt portal 2018-09-06 17:44:31 +05:30
Sanjay Kumar
1b49f3a4e7 Allow cost center in entry of balance sheet accounts (#14972)
* Allow Cost Center In Entry of Balance Sheet Account

* Add parent cost center in get payment entry

* Add Tests for Allow Cost Center In Entry of Balance Sheet Account

* Add tests for cost center wise account and party balance

* set parent cost center in taxes

* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents

* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Nabin Hait
b94008dab3 fix(patch): reload loyalty program in healthcare patch 2018-09-06 14:27:03 +05:30
Nabin Hait
8652bce9e3 Update modules.txt 2018-09-06 14:18:49 +05:30
Faris Ansari
4e372a30fa fix(patch): Remove old Hub Page (#15328) 2018-09-06 14:08:31 +05:30
Prateeksha Singh
df327f2974 [remove-hub] delete hub module 2018-09-06 13:34:47 +05:30
Prateeksha Singh
3ccbb8f8b7 [remove-hub] delete hub_settings and hub_category 2018-09-06 13:28:47 +05:30
Zarrar
1b37186460 set POS Invoice format only if its enabled (#15326) 2018-09-06 13:25:52 +05:30
ahmad zaqout
2350dc26f6 fix syntax error HTTPError in amazon_mws_api (#15324) 2018-09-06 13:21:04 +05:30
Zarrar
0d931e1d7d fix uom & stock_uom print hide logic (#15327) 2018-09-06 13:08:58 +05:30
Nabin Hait
f846c43361 Merge branch 'ESS-LLP-healthcare_v11_wip' into develop 2018-09-06 13:07:08 +05:30
Nabin Hait
ffeff2d385 fix(tests): reset session user as administrator after running tests 2018-09-06 12:45:07 +05:30
Nabin Hait
e5a4037b57 minor fix in deferred revenue booking 2018-09-05 17:44:39 +05:30
Nabin Hait
aacb915cae Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip 2018-09-05 17:21:47 +05:30
Zarrar
2705af488d [Minor] [Staging] POS Profile (#15321)
* update modified date to load field display_items_in_stock

* stop dialog from popping up if no loyalty program found

* warehouse not used for not is_pos type invoice
2018-09-05 17:20:07 +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
Pawan Mehta
6010a10ad1 Amazon MWS Connector (#15061)
* [fix] #15054

* [fix] #15058

* codacy issues

* Codacy fixes-1

* Travis Fix

* fix codacy

* fix codacy

* review changes 1

* Custom fields and fixes

* remove amazon id

* remove item.json and sales_order.json

* added back sales_order and item files
2018-09-05 17:16:57 +05:30
Benji
6c9a92671b Minor bugfix (#15210)
* Minor bugfix

Bugfix for https://github.com/frappe/erpnext/pull/15170

* Update project.py
2018-09-05 13:24:53 +05:30
Nabin Hait
5122a8e0d7 Merge branch 'staging' into develop 2018-09-05 11:47:30 +05:30
johnhkelley1
431b4fba72 Allow for 0 valuation rate in Stock Reconciliation (#15313)
Currently, a valuation rate of 0 gets treated the same as an omitted
valuation rate, and gets overwritten during validation. This hotfix
allows a Stock Reconciliation Item's valuation rate to be set to 0.
2018-09-05 11:43:28 +05:30
Zarrar
3cea3c46b6 change modified date of account to reload fields (#15317) 2018-09-05 11:41:54 +05:30
Saif
8f00db58bd -Moved JE's User Remark on the top of the generated remarks (#15314)
-Added a field in JE's Account entries to add remarks in specific JE Account entry
2018-09-05 11:13:06 +05:30
rohitwaghchaure
bcaca85873 [Fix] Meta object has no attribute permissions (#15316) 2018-09-05 11:10:17 +05:30
KanchanChauhan
73bd3cb278 Moved daily event (update_latest_price_in_all_boms) to daily_long since it was timing out (#15253) 2018-09-05 11:01:35 +05:30
Charles-Henri Decultot
b07f482c0c Test case for contact references (#15077)
* test case for contact references

* Add teardown
2018-09-05 11:00:14 +05:30
Prateeksha Singh
f9c5da5df0 Merge pull request #15310 from pratu16x7/marketplace-fixes
[fix] filter() result in list
2018-09-04 11:01:25 +05:30
Prateeksha Singh
8a160684b7 [fix] filter() result in list 2018-09-04 10:59:20 +05:30
Faris Ansari
f8af7e0b3d Merge pull request #15309 from frappe/hub-multiuser
fix: Revert skeleton in Sidebar
2018-09-04 10:43:52 +05:30
Faris Ansari
7be9c381d8 fix: Revert skeleton in Sidebar
- sidebar items repeating for some reason
2018-09-04 00:12:47 +05:30
Faris Ansari
74a32e6ffe Merge pull request #15305 from frappe/hub-multiuser
feat: Add skeleton to Home and Sidebar
2018-09-03 19:40:22 +05:30
Faris Ansari
66321e6af7 feat: Add skeleton to Home and Sidebar 2018-09-03 19:39:19 +05:30
Prateeksha Singh
76f2430152 Merge pull request #15303 from frappe/hub-multiuser
Hub Multiuser
2018-09-03 18:57:41 +05:30
Prateeksha Singh
1265a26c0c Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d [hub] update settings after publish, fix route_map 2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16 Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de [hub] hide Contact Seller and Save Item in read-only 2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016 fix: Selling Messages 2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d [hub] show become a seller button to all, but not dialog 2018-09-03 17:31:43 +05:30
Faris Ansari
49ccdd6f07 fix: Move image saving code to hub server 2018-09-03 17:24:17 +05:30
Faris Ansari
d4bba297c2 fix: Container title 2018-09-03 17:12:22 +05:30
Saurabh
1fe1884b73 Merge branch 'master' into develop 2018-09-03 17:00:17 +05:30
Saurabh
fba985d49d Merge branch 'hotfix' 2018-09-03 17:00:15 +05:30
Saurabh
4bd562d669 bumped to version 10.1.51 2018-09-03 17:30:15 +06:00
Faris Ansari
28652baacc Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e fix: email in profile dialog 2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17 [fix] add message for admin users before register dialog
- use is_registered api for page routes
2018-09-03 16:39:59 +05:30
Prateeksha Singh
8fe5e8adf8 Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:15:42 +05:30
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Saurabh
64aed6a16a Merge pull request #15301 from saurabh6790/staging
[fix] setup lang in patch
2018-09-03 16:08:25 +05:30
Saurabh
7b38d93e03 [fix] setup lang in patch 2018-09-03 16:07:40 +05:30
Frappe PR Bot
5c0a831ff2 [Translation] Updated Translations (#15299) 2018-09-03 15:58:04 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109 [marketplace] Disallow unregistered routes if not registered 2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Shreya Shah
bb88e964a4 Remove unnecessary code (#15296) 2018-09-03 13:01:12 +05:30
Nabin Hait
13109aef9d fix: validate only if service stop date 2018-09-03 12:18:17 +05:30
Jamsheer
8f808cbaf6 Patch - redesign healthcare billing work flow - fix 2018-09-03 11:26:19 +05:30
Jamsheer
34e561876a Test prescription in Sales Invoice - Patient Encounter in draft status 2018-09-03 11:26:19 +05:30
Jamsheer
0640b4794e Healthcare Practitioner - dashboard - updated 2018-09-03 11:26:19 +05:30
Jamsheer
a3b76fa40e Healthcare - Masters - allow import set to 1 2018-09-03 11:26:19 +05:30
Jamsheer
b0ea297cf8 Patient Appointment - department - reqd = 0 2018-09-03 11:26:19 +05:30
Ranjith
2e48337cd4 Patient Encounter - update fields patient_name, patient_age 2018-09-03 11:26:19 +05:30
Jamsheer
a0b3e0268b Healthcare - Doctype - field index = 1 2018-09-03 11:26:19 +05:30
Jamsheer
359bb512b4 Payment mode and Paid amount in Patient Appointment 2018-09-03 11:26:18 +05:30
Jamsheer
7cc205946c Restrict to Healthcare 2018-09-03 11:26:18 +05:30
Jamsheer
363deb67c3 Automate - Patient Apointment Invoicing 2018-09-03 11:26:18 +05:30
Jamsheer
4371c7e492 Healthcare Service Unit - Tree View Updated 2018-09-03 11:26:18 +05:30
Jamsheer
c64880b578 Invoice - lab prescription from submitted Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
0ae100b035 Configuration - Create Lab Test on Sales Invoice Submit 2018-09-03 11:26:18 +05:30
Jamsheer
61574d18bf Fix - Create Multiple Lab Test from Sales Invoice or from Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
858e026fc0 Lab Test - Create Multiple from Sales Invoice or from Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
80468bec31 Lab Test - Remove unused methods 2018-09-03 11:26:18 +05:30
Jamsheer
2ae06d3a35 Healthcare Service Unit - rename field - occupied to occupancy status 2018-09-03 11:26:18 +05:30
Jamsheer
b19993b5bc Codacy - fixes 2018-09-03 11:26:18 +05:30
Jamsheer
25dda3a91a Invoice inpatient occupancy - Qty updated 2018-09-03 11:26:18 +05:30
Jamsheer
9b9518eaaa Healthcare Service Unit Type - Validation and Item price updation 2018-09-03 11:26:18 +05:30
Jamsheer
c8f827be66 Healthcare Service Unit Type - Field - UOM Conversion in Hours 2018-09-03 11:26:17 +05:30
Jamsheer
ee5f9c7b80 Healthcare Invoice - Practitioner Specific Service Item 2018-09-03 11:26:17 +05:30
Jamsheer
e1d215352b Healthcare Practitioner - Service Item Fields - Filter and Validation 2018-09-03 11:26:17 +05:30
Jamsheer
1dbfd5c1e7 Healthcare Settings - Heathcare Service Item - Validation 2018-09-03 11:26:17 +05:30
Jamsheer
e82f27ac10 Healthcare - Invoice Drug Prescription 2018-09-03 11:26:17 +05:30
Jamsheer
197cd88d36 Lab Test Template - rate updation - fix 2018-09-03 11:26:17 +05:30
Jamsheer
a5c3fc69b8 Patch - Healthcare - Invoice - fix 2018-09-03 11:26:17 +05:30
Jamsheer
8da6f4e30c Healthcare - Invoice - Redesign 2018-09-03 11:26:17 +05:30
Jamsheer
25e535c66f Clinical Procedure Item - Remove field invoiced 2018-09-03 11:26:17 +05:30
Jamsheer
1646010059 Clinical Procedure - Consumables Invoice Separately 2018-09-03 11:26:17 +05:30
Jamsheer
0eb64ca38b Healthcare Settings - Filter For Service Items 2018-09-03 11:26:16 +05:30
Jamsheer
edf8821a4e Healthcare Settings - fields - service items 2018-09-03 11:26:16 +05:30
Jamsheer
b2a615b8e8 Healthcare Practitioner - new field - Inpatient Visit Charge 2018-09-03 11:26:16 +05:30
Jamsheer
7f51ffa5eb Patch - Healthcare - Redesign Billing - fix 2018-09-03 11:26:16 +05:30
Jamsheer
eafb046fce Healthcare Utils - prescription - invoice - fix 2018-09-03 11:26:16 +05:30
Jamsheer
fd2879c077 Patch - Healthcare - Redesign Billing 2018-09-03 11:26:16 +05:30
Jamsheer
c6974a79a8 Sales Invoice - show Healthcare Fields - Healthcare in active Domains 2018-09-03 11:26:15 +05:30
Jamsheer
94efed161a Fee Validity - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
146683bbff Fee Validity - invoice reference 2018-09-03 11:26:14 +05:30
Jamsheer
f7a6531fb3 Inpatient Record - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
54ae74eb28 Inpatient Billing 2018-09-03 11:26:14 +05:30
Jamsheer
8cb142bf29 Field Changes - Healthcare Invoice Work Flow Redesign 2018-09-03 11:26:14 +05:30
Jamsheer
bab55390f8 Sales Invoice in Patient Dashboard 2018-09-03 11:26:14 +05:30
Jamsheer
ba11972302 Healthcare Service - Invoice Work Flow - Redesign 2018-09-03 11:26:14 +05:30
Frappe PR Bot
3921660747 [Translation] Updated Translations (#15285) 2018-09-03 11:14:57 +05:30
Saurabh
0754ece288 Patch fixes (#15295)
* patch fixes

* [Fix] disable shopify if any exception occured while
2018-09-03 10:44:40 +05:30
Prateeksha Singh
85563ddfd3 [hub] update publish hub api 2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06 [hub][api] Update save and view api to be user specific 2018-09-03 02:25:41 +05:30
Prateeksha Singh
2cf52e53dd Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-02 19:46:30 +05:30
Prateeksha Singh
a094c0f3f1 [fix] encrypted password in Hub User child record by frappe/frappe#6048
- use save() instead of insert()
2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods
- wip
2018-09-02 18:29:00 +05:30
Nabin Hait
02257449d9 Merge branch 'develop' into staging 2018-09-01 19:04:50 +05:30
Nabin Hait
41b630759c fixed type 2018-09-01 18:37:07 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +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
Faris Ansari
255dd0e03d feat: Add new registration flow 2018-09-01 14:30:46 +05:30
Prateeksha Singh
ddcf3b4345 [hub] merge with upstream 2018-09-01 10:33:24 +05:30
Prateeksha Singh
4e1fd0b417 [hub] register_seller -> register_marketplace
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
2018-09-01 09:55:43 +05:30
Prateeksha Singh
810ae01832 [hub] make client connection for first registered user
- remove usage of Hub Connector
2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962 [fix] hub_url -> marketplace_url 2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248 [fix] save() -> insert() for single doc, use doc.append in child table 2018-09-01 00:12:17 +05:30
Prateeksha Singh
a8065ff725 [hub] move register_seller to api, remove old code 2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1 [hub] set first user's password in marketplace users 2018-08-31 20:42:48 +05:30
Prateeksha Singh
3588486e5b [fix] hub_settings -> marketplace_settings in call 2018-08-31 20:12:33 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
5f76c0caf4 Merge pull request #15284 from netchampfaris/marketplace-fixes-4
fix: Allow read permission to everyone on Marketplace Settings
2018-08-31 17:37:13 +05:30
Faris Ansari
dc1a2e2a37 fix: Allow read permission to everyone on Marketplace Settings 2018-08-31 17:31:22 +05:30
Nabin Hait
f1a3fbdb6b minor fixes in dropship 2018-08-31 17:05:20 +05:30
Fisher Yu
2e5c776293 Update sales_order.py
1. filter out the suppliers by which the dropship purchase order already created
2. allow create multi dropship draft purchase orders
2018-08-31 17:05:20 +05:30
Fisher Yu
102bc7f5cf Update sales_order.js
for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.
2018-08-31 17:05:20 +05:30
rohitwaghchaure
5f79479bd0 Merge pull request #15282 from rohitwaghchaure/budget_should_check_on_submit_document
[Minor] Don't validate on cancelled budgets
2018-08-31 16:59:56 +05:30
Rohit Waghchaure
12b4096e68 [Minor] Don't validate on cancelled budgest 2018-08-31 16:54:59 +05:30
Faris Ansari
c05bf262f1 Merge pull request #15279 from netchampfaris/marketplace-fixes-3
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:52:26 +05:30
Valmik
2175b90b8d Added feature to optimize routes, also cleaned up code (#15193) 2018-08-31 16:39:29 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +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
Faris Ansari
25f509ebd3 feat: Add disable marketplace option in Hub Settings 2018-08-31 15:35:32 +05:30
Nabin Hait
1b73505391 Update sales_invoice.py 2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d minor fixes 2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9 minor fixes 2018-08-31 14:49:20 +05:30
Ameya Shenoy
96c89f478f Merge pull request #15278 from codingCoffee/indent
indentation: fixes
2018-08-31 09:14:09 +00:00
Ameya Shenoy
203152d67e indentation: fixes 2018-08-31 14:33:48 +05:30
Nabin Hait
9ecd8cc004 Merge branch 'Zlash65-defer-stop-date' into develop 2018-08-31 13:30:21 +05:30
Nabin Hait
e033df2757 minor fixes 2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06 Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date 2018-08-31 12:39:46 +05:30
Saurabh
5c3590fa8d Merge branch 'master' into develop 2018-08-31 11:29:14 +05:30
Saurabh
1ef72c0b66 Merge branch 'hotfix' 2018-08-31 11:29:13 +05:30
Saurabh
648191b9e8 bumped to version 10.1.50 2018-08-31 11:59:13 +06:00
Shreya Shah
ee8f8281b4 [py3] Convert filter object to list (#15260) 2018-08-30 19:22:22 +05:30
Faris Ansari
91ac26c2ff fix(seller dialog): Email should be session user email (#15270) 2018-08-30 19:19:57 +05:30
rohitwaghchaure
624927bf0b [Fix] Not able to export the Supplier-Wise Sales Analytics report (#15271) 2018-08-30 19:19:14 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Bassam Ramadan
8d7c1868d6 fix for fields names at sales invoice return payments and verifying the payment amount (#15245)
* fix for payments field names in sales invoice return

* add verification for payment amount at sales invoice return

adding verification to be sure the payment amount is negative at sales
invoice return

* correction for precision field name
2018-08-30 19:15:15 +05:30
KanchanChauhan
0cd5313c69 Validate Completed Qty and Produced qty in Stock Entry for Manufacture (#15248) 2018-08-30 19:11:15 +05:30
Nabin Hait
9983d41fb0 Fixed divison error 2018-08-30 19:10:36 +05:30
Faris Ansari
00f6aef947 fix(publish items): Filter out disabled items (#15268) 2018-08-30 18:54:28 +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
Nabin Hait
f6b784e39e Test fixes 2018-08-30 18:42:35 +05:30
Shreya Shah
68348d4130 [Attendance-Tool] Filter employees based on date of joining (#15262) 2018-08-30 17:25:58 +05:30
Shreya Shah
3df2639a32 Optimize patch (#15263) 2018-08-30 17:24:03 +05:30
Prateeksha Singh
75ae844d70 Merge pull request #15247 from frappe/hub-redesign
[encore] MarketPlace
2018-08-30 17:12:41 +05:30
Prateeksha Singh
ecad873d19 [hub] remove item.js, fix seller decription condition 2018-08-30 16:21:26 +05:30
Nabin Hait
2390da647f GSTR-1 minor fixes 2018-08-30 16:16:48 +05:30
Prateeksha Singh
5797565dd0 Merge with upstream 2018-08-30 16:15:27 +05:30
Prateeksha Singh
ff52e93e69 [hub] Merge conflicts 2018-08-30 16:11:41 +05:30
Prateeksha Singh
997bfa4916 [hub] add review timeline element 2018-08-30 16:08:52 +05:30
Faris Ansari
f3034ae262 feat: Add Report Item dialog 2018-08-30 16:05:15 +05:30
Faris Ansari
8e04487253 fix: Rename 'Product' to 'Item' 2018-08-30 15:35:17 +05:30
Prateeksha Singh
dc36d52ef9 [hub] fix review send 2018-08-30 15:12:18 +05:30
Faris Ansari
6b695d32b2 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 14:36:14 +05:30
Faris Ansari
90265aec24 fix: Page container routing 2018-08-30 14:36:05 +05:30
Faris Ansari
062cd62484 fix: Add restrictions for session user who is not hub seller 2018-08-30 14:35:56 +05:30
Prateeksha Singh
bff2bdc858 [hub] UI and empty state in 'your products' to guide on publishing 2018-08-30 12:58:46 +05:30
Prateeksha Singh
47f5f0e608 [hub] remove See All from non expandable sections 2018-08-30 12:16:08 +05:30
Prateeksha Singh
a4c24bda65 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 12:01:39 +05:30
Prateeksha Singh
b20c4e3184 [hub] remove client hub_settings scripts
- multiline to single line messages to translate
2018-08-30 12:01:04 +05:30
Faris Ansari
d32e7f8d02 fix: Administrator cannot register on marketplace 2018-08-30 11:53:46 +05:30
Faris Ansari
95e4141bf2 fix: Remove unused imports 2018-08-30 11:46:14 +05:30
Shreya Shah
e3f855498f Update README.md 2018-08-30 10:41:53 +05:30
Shreya Shah
9c03ed0a42 Update README.md
move codetriage badge with other badges
2018-08-30 10:41:37 +05:30
Zlash65
80f5cb05cc fixes in setting end_date and manual provision of start&end date 2018-08-30 10:39:48 +05:30
Zlash65
91eae54383 manually provide start and end date 2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6 start date logic fix 2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943 end date / stop date calc fix 2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383 end date should reset if start date is changed 2018-08-30 10:39:48 +05:30
Zlash65
d676a67769 validate changing service stop date once its set 2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15 book last gl_entry based on service stop date 2018-08-30 10:39:48 +05:30
Zlash65
243863a290 validation for stop date added 2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e service stop date field added 2018-08-30 10:39:48 +05:30
Rushabh Mehta
f31e6153cc readme: codetriage badge 2018-08-30 10:36:01 +05:30
Rushabh Mehta
20fd2ddd1c ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
Prateeksha Singh
04d051bb73 [hub] add review area 2018-08-30 02:42:13 +05:30
Prateeksha Singh
89ed2d9b34 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 02:33:28 +05:30
Prateeksha Singh
a6f184bcb7 [hub] remove old post and preprocess, log with minimal info 2018-08-30 02:30:40 +05:30
Faris Ansari
114d595de9 fix: Set hub_url in Hub Settings
- add patch to set the value
2018-08-29 18:24:49 +05:30
Faris Ansari
e4c7729089 fix(Hub Settings): Set site_name before seller registration 2018-08-29 17:13:43 +05:30
Faris Ansari
b7126c23f7 fix(Hub Settings): Remove unused fields 2018-08-29 17:13:16 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab (fix)test case: loyalty program, course schedule and more 2018-08-29 17:05:11 +05:30
Faris Ansari
458cf6fcc5 style: remove trailing spaces 2018-08-29 16:19:39 +05:30
Faris Ansari
8683bd82ed fix: Base64 extraction
- use requests to fetch the image without storing it anywhere
- only read local files
2018-08-29 16:18:36 +05:30
Faris Ansari
ff8f1c6120 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416 fix: Only a System Manager can register as a seller
- every other user has read only access
2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6 [hub] fix code lint issues, styles 2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Nabin Hait
d982e8fcda Merge branch 'hotfix' 2018-08-29 13:13:54 +05:30
Nabin Hait
af497ef669 bumped to version 10.1.49 2018-08-29 13:43:53 +06:00
Nabin Hait
6b539d65d7 Restored missing rounded_total fields 2018-08-29 12:41:23 +05:30
Faris Ansari
8bc954ecc6 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 18:29:08 +05:30
Faris Ansari
b26381e6b8 fix: Scroll to top when route changes 2018-08-28 18:29:01 +05:30
Prateeksha Singh
bd7d964848 [hub] Merge Develop 2018-08-28 18:25:07 +05:30
Zarrar
af370c8147 Merge pull request #15242 from frappe/revert-15241-google_maps_settings
Revert "Google maps settings"
2018-08-28 17:26:47 +05:30
Zarrar
34208cc89d Revert "Google maps settings" 2018-08-28 17:25:21 +05:30
Prateeksha Singh
2d45373f33 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:25:01 +05:30
Prateeksha Singh
1e02f00075 [hub] record views, update favourite api 2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97 fix: Show empty state if there are no items 2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:17:36 +05:30
Faris Ansari
811a2deb0f fix: Load and save base64 image in publish 2018-08-28 17:17:29 +05:30
Faris Ansari
5689494f9c chore: Remove old messages page 2018-08-28 16:52:17 +05:30
Saurabh
9cfde278ad Merge pull request #15241 from saurabh6790/google_maps_settings
Google maps settings
2018-08-28 16:28:39 +05:30
Saurabh
5b398f293a [fix] typo fix 2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0 [fix] naming series refactor patch 2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895 [fix] naming series refactor patch 2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7 [fix] naming series refactor patch 2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74 [fix] fix google map imports (#15240) 2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf [fix] naming series refactor patch 2018-08-28 15:18:48 +05:30
Suraj Shetty
b92403fbed Add 'Become Seller' as a primary key
- Also remove some unwanted code
2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b Remove 'Become Seller' option from sidebar 2018-08-28 15:03:01 +05:30
Nabin Hait
2b9186da5a [fix] naming series patch 2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307 [fix] for python 3 2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7 [fix] missing functions related to google maps 2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c minor fix 2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094 [minor][fix] call update_percent_complete via validate (#15235) 2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f Improve performance for warehouse tree (#15207)
* Fix conflicts

* Modify query structure

* Remove whitespaces
2018-08-28 13:46:22 +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
Saurabh
fe9ba73c34 Merge pull request #15236 from saurabh6790/v11_patch_fixes
patch sequence fix
2018-08-28 13:20:26 +05:30
Saurabh
1898e11585 patch sequence fix 2018-08-28 13:04:40 +05:30
Suraj Shetty
9a50044003 Merge pull request #15232 from surajshetty3416/fixes-and-improvements
UI enhancements
2018-08-27 20:38:11 +05:30
Suraj Shetty
ec12b34a79 Add margin below publish area 2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e Add strip html filter 2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548 fix: Add empty state in Selling 2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9 feat: Selling Page
- common Messages page for both buying and selling
2018-08-27 19:51:36 +05:30
Saurabh
4d0a581c29 Merge pull request #15230 from saurabh6790/v11_patch_fixes
[Fix] patch fixes for V11 migration
2018-08-27 18:17:14 +05:30
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +05:30
Prateeksha Singh
bc859cbf1d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f [hub] merge conflicts 2018-08-27 15:16:19 +05:30
Faris Ansari
45a12e790b Merge pull request #15227 from surajshetty3416/fixes-and-improvements
Remove occurrences of hub_item_code and replace some hub_item_code -> hub_item_name
2018-08-27 15:00:42 +05:30
Suraj Shetty
dc7e8e6a26 Replace hub_item_code -> hub_item_name 2018-08-27 14:11:48 +05:30
Zarrar
93577665f2 [Enhance] Multiselect for Cost Center and Project (#15208)
* add filter for Cost Center, make CC & Project multiselect field

* update queries according to project/cost_center multiselect

* add multiselect filter for cost_center and project

* update query according to multiselect
2018-08-27 12:08:53 +05:30
Maxwell Morais
a2c1d92374 Revert "Fix shipping_address for DropShipping" (#15218)
* Revert "Cleaned up welcome email code (#15175)"

This reverts commit 771fbb8f01.

* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)"

This reverts commit 2b72d09948.

* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)"

This reverts commit c5cf428d00.

* Revert "[Minor] Create default department on country setup (#15206)"

This reverts commit 2b2712bb9e.

* Revert "Permissions issue in BOM tree"

This reverts commit 8fe8d1758a.

* Revert "Fix indentation accounts_receivable.py (#15203)"

This reverts commit fbc3df3247.

* Revert "Fix shipping_address for DropShipping (#15202)"

This reverts commit 4a394bcbf4.
2018-08-27 12:05:41 +05:30
Ahmed Madi
1516b8d54a Update asset_category.js (#15222) 2018-08-27 12:04:12 +05:30
Zarrar
b94c7075d8 rectify item price route (#15223) 2018-08-27 11:44:13 +05:30
rohitwaghchaure
e33047250e [Fix] Speacial character issue in searching project in sales invoice (#15220) 2018-08-27 11:43:57 +05:30
Prateeksha Singh
fa26899cd0 [hub] added DetailHeaderItem to detail pages, contact seller button 2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda [hub] Register components, init Item Page
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7 feat: Sidebar in vue 2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e fix: Add back link to Buying 2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69 chore: Remove old messages files 2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9 feat: Buying and BuyingMessages in vue 2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940 feat: Add helper directives
- v-route
  automatically route to a valid frappe route
- v-img-src
  handle img loading and error handling
2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823 feat: SectionHeader component 2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd fix(search-input): submit on enter 2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27 feat: Add dynamic routes in PageContainer 2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94 [hub][vue] add action object in empty state, make NotFound page 2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5 [hub][vue] add skeleton state to DetailView 2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda [hub][vue] Seller Page 2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86 [hub][vue] DetailView and Profile page 2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff feat: Add PageContainer 2018-08-26 12:41:02 +05:30
Faris Ansari
a760d8cce7 Merge pull request #15212 from surajshetty3416/fixes-and-improvements
Separate links for selling and buying messages
2018-08-26 12:03:56 +05:30
Suraj Shetty
0e59ec3ed2 Update messages UI 2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9 Separate links for selling and buying messages
- Add separate UI for selling messages
- Remove some redundant code messages
2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543 [hub][vue] Home page, add section title in item key in v-for 2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9 [hub][vue] search page 2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b [hub][vue] Category and Published Products pages 2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013 [hub][vue] replace page files, fix item 'seen' prop 2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e [hub][vue] Saved Products Page, remote item card
- also undo unfavouriting items
2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974 [hub][vue] add import 2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a [hub][vue] Publish Page 2018-08-24 16:38:34 +05:30
Neil Trini Lasrado
771fbb8f01 Cleaned up welcome email code (#15175) 2018-08-24 15:15:56 +05:30
rohitwaghchaure
2b72d09948 [Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187) 2018-08-24 11:28:34 +05:30
rohitwaghchaure
c5cf428d00 [Enhance] Provision to backflush raw materials from WIP warehouse (#15184) 2018-08-24 11:27:41 +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
Prateeksha Singh
67e0374261 [hub] add data-driven notification message 2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d [hub][vue] add empty state and dynamic publish button 2018-08-23 21:25:53 +05:30
Nabin Hait
8fe8d1758a Permissions issue in BOM tree 2018-08-23 16:25:51 +05:30
Nabin Hait
4b9f20edb3 Permissions issue in BOM tree 2018-08-23 16:24:56 +05:30
Prateeksha Singh
d7d2bb261b [hub] add SearchInput 2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845 [hub][vue] init item card container in vue 2018-08-23 12:22:20 +05:30
Prateeksha Singh
cfb6929f5c Merge pull request #15194 from surajshetty3416/fixes-and-improvements
UI/UX fixes and improvements
2018-08-23 12:16:31 +05:30
Mario Monroy
fbc3df3247 Fix indentation accounts_receivable.py (#15203) 2018-08-23 11:10:15 +05:30
Faris Ansari
c4e38ffd4d Remove hub page (#15195) 2018-08-23 11:09:31 +05:30
Maxwell Morais
4a394bcbf4 Fix shipping_address for DropShipping (#15202)
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.

To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
2018-08-23 11:08:37 +05:30
Charles-Henri Decultot
25712f8d65 Sales order correction (#15190) 2018-08-23 10:51:44 +05:30
Benji
363dd2773e Update email_digest.py (#15144) 2018-08-22 21:57:51 +05:30
Suraj Shetty
341386e3a7 Add list view for messages 2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc Add recent message block to item_card 2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1 Remove unused message to avoid confusion 2018-08-22 16:44:55 +05:30
Valmik
6ad16db88c check for existing task before appending to child table (#15183) 2018-08-22 14:46:33 +05:30
Shreya Shah
be7703387d Fetch reserved qty (#15182)
* Fetch reserved qty

* Update get_item_details.py
2018-08-22 14:45:22 +05:30
Faris Ansari
427a1301b7 Issues on the Portal should be editable (#15181) 2018-08-22 14:43:32 +05:30
Suraj Shetty
7ee79498fc Hide review option for unregistered user 2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101 Stop event bubbling on clicking edit item 2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11 Fix publish button alignment 2018-08-22 11:50:23 +05:30
Suraj Shetty
fc7b7b6b97 Allow item list for System Manager 2018-08-22 11:32:49 +05:30
Suraj Shetty
7a040c4dd8 Show favorite button only for registered user 2018-08-22 11:32:49 +05:30
Suraj Shetty
f9e4cca334 Throw error if hub_url is not present in site_config 2018-08-22 11:32:49 +05:30
Suraj Shetty
3cd0c54438 Fix pyhton 3 compatibility 2018-08-22 11:32:49 +05:30
Prateeksha Singh
631c170ccf [hub] fix merge conflicts 2018-08-21 21:00:53 +05:30
Prateeksha Singh
caadd8af4e [Hub] sync with insert_many, Remove Data Migration Run 💥
- Use FrappeClient insert_many to publish items
- We will be syncing small amounts of items anyway
- Also, we need only the insert action in bulk
2018-08-21 19:59:15 +05:30
Faris Ansari
e745e85d98 feat: route to message room page after contact seller dialog 2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6 fix: remove items with invalid image 2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17 Merge with upstream 2018-08-21 19:17:25 +05:30
Faris Ansari
ff189b6853 fix: publish items
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
2018-08-21 19:14:44 +05:30
Faris Ansari
d29a3b3567 Highlight links with part route or full route 2018-08-21 19:12:10 +05:30
Zarrar
aac5a7beba Merge pull request #15188 from Zlash65/indent-fix
[Minor] Indentation fix
2018-08-21 18:23:23 +05:30
Zlash65
4d462d637f indentation fix 2018-08-21 18:19:26 +05:30
Rushabh Mehta
9a29bfa49e fix(indentation): sales_and_purchase_return.py 2018-08-21 17:53:25 +05:30
Prateeksha Singh
b0a3a106fc [hub] profile email uneditable, style additions, base64 sync enable 2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719 Add BuyingMessages page 2018-08-20 18:33:46 +05:30
Bassam Ramadan
1ff2315899 Trial balance and payable accounts reports and sales return fixes (#15000)
* adding supplier type filter to payable accounts and payable accounts summary reports

adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter

* fix trial balance opening and closing values

the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account

* fix for supplier type filter field on payable accounts reports

rename the supplier type filter field to supplier group in payable
accounts and summary reports

* fix for paid amount in returned sales invoice

the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.

* fixing trial balance values and totals

fixing trial balance opening and closing ( DR - CR ) values and totals
2018-08-20 17:58:28 +05:30
Saif
15636a3b98 Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency (#15153)
Fix: PO will set party_account_currency to supplier's default currency on validation.
2018-08-20 17:57:00 +05:30
Saif
a09a8c3bf7 Fixed missing DocType info for Purchase Items (#15152)
* Made Purchase Invoice Items' Batch No and Serial No fields non copyable.

* Added appropriate currency field options to Purchase...Items DocFields:
-Landed Cost Voucher Amount
-Billed Amt
2018-08-20 17:55:18 +05:30
rohitwaghchaure
8cca61f1ba [Fix] Removed roles for Eway bill report (#15157) 2018-08-20 17:53:56 +05:30
rohitwaghchaure
b800382abf [Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163) 2018-08-20 17:50:31 +05:30
rohitwaghchaure
e689a903d8 Allowed data import for Assessment Result (#15168) 2018-08-20 17:50:04 +05:30
Saif
e3947296e8 Group by Voucher fix in General Ledger Report (#15169)
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries

* Group by Voucher show groups with totals at the end of group
2018-08-20 17:49:29 +05:30
Benji
299185fe24 Improved task weight calc (#15170)
* Improved task weight calc

Removed the requirement to have total of task weights to be exactly 1.

* Update project.py
2018-08-20 17:41:56 +05:30
rohitwaghchaure
ecc6af9d2a [Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171) 2018-08-20 17:39:54 +05:30
Nabin Hait
c95153f83b Offer date mandatory in job offer 2018-08-20 16:58:06 +05:30
Faris Ansari
8de6380648 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771 [hub] response data in hub call event trigger 2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de [hub] emit hub call event to set category options while publishing 2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007 [feat] new component: ItemPublishDialog 2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011 [feat] new component: NotificationMessage 2018-08-20 13:07:23 +05:30
Zarrar
2b0ecbed2b python3 based fix for sorted (#15159) 2018-08-20 11:15:06 +05:30
Prateeksha Singh
42be665412 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d [hub][feat] stateful publishing area 2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60 [hub][feat] Edit your Profile, recycle profile dialog 2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1 [hub] Register in a dialog instead of Page
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
2018-08-20 00:25:26 +05:30
Prateeksha Singh
a525d12f69 [hub] sync multiple image urls
- using a simple multiselect currently
2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96 [hub] Publishing Dialog, Sync category
- Hub Category selection
- Recycled
2018-08-19 19:39:00 +05:30
Faris Ansari
2ce2e1b6b0 feat(messages): split messages into buying and selling
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f feat: custom cache invalidation for hub calls
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7 feat: empty states for favourites and search page 2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439 refactor: rename hub-card-container to hub-items-container 2018-08-17 14:29:22 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
Nabin Hait
9409eddf28 Update __init__.py 2018-08-16 13:58:44 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Charles-Henri Decultot
bd06a5b0ee Small python 3 compatibility correction (#15151) 2018-08-16 10:32:49 +05:30
Shreya Shah
80f30094fb Fix error msg (#15146) 2018-08-16 10:29:16 +05:30
rohitwaghchaure
6fb2117767 Allow to make budget for the same cost center with different account (#15149) 2018-08-16 10:22:06 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
rohitwaghchaure
7e36aa4162 Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report
[Fix] Consolidated balance sheet report
2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85 [Fix] Consolidated balance sheet report 2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa rounding off fixes and conversion fix (#15140) 2018-08-14 16:28:14 +05:30
Ameya Shenoy
338dfcfb63 monkey patching for demo (#15141) 2018-08-14 16:27:47 +05:30
Saurabh
acd47de3ca Change page link 2018-08-14 15:04:17 +05:30
Prateeksha Singh
460e2798cd [hub] Favourites UI
- remove from listing
- add to favourites
2018-08-14 11:42:40 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124)
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
2018-08-14 10:51:48 +05:30
rohitwaghchaure
88b0a1305f Code optimization for accounts receivable report to avoid timeout error (#15114)
* Code optimization for accounts receivable report to avoid timeout error

* Added index for party_type
2018-08-14 10:51:13 +05:30
Prateeksha Singh
1a0fb5b63a Add detail page favourited state 2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785 [refactor][major] Separate out Components
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
2018-08-13 21:36:07 +05:30
Nabin Hait
3b5f18231a fix(item_defaults): Item name was overwriting by child name 2018-08-13 17:45:29 +05:30
Saurabh
ddbf3aaccb Merge branch 'master' into develop 2018-08-13 13:15:58 +05:30
Saurabh
9e98fdfc6e Merge branch 'hotfix' 2018-08-13 13:15:56 +05:30
Saurabh
cd6b955b99 bumped to version 10.1.48 2018-08-13 13:45:56 +06:00
Saurabh
bfd26b7084 Merge pull request #15131 from rohitwaghchaure/project_task_custom_field_not_copying
Project task custom field not copying and error on project
2018-08-13 12:15:40 +05:30
Rohit Waghchaure
18960c7757 Project task custom field not copying and error on project 2018-08-13 11:40:11 +05:30
Zarrar
a8d8f52ef8 Merge pull request #15127 from ahmedzaqout/patch-3
replace customer to department
2018-08-12 17:48:29 +05:30
Zarrar
a4d06fc881 replace cur_frm with frm 2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b replace department group to department 2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9 replace customer to department 2018-08-11 21:54:56 +03:00
Nabin Hait
c35271aef5 fix(various) 2018-08-10 19:01:13 +05:30
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
Saurabh
9a7838265d Merge branch 'hotfix' 2018-08-10 17:07:01 +05:30
Saurabh
57d3c93e6b bumped to version 10.1.47 2018-08-10 17:37:01 +06:00
Prateeksha Singh
b777f3dbfd [layout][iterate] item detail page actions 2018-08-10 10:38:28 +05:30
Nabin Hait
8bf52fef42 minor fixes 2018-08-09 19:45:33 +05:30
Nabin Hait
c13960ddc9 minor fix 2018-08-09 18:25:03 +05:30
Nabin Hait
e07bf15de2 minor fix 2018-08-09 17:38:04 +05:30
rohitwaghchaure
a0b846fb88 [Minor] Added condition for get_bank_cash_account (#15112) 2018-08-09 15:51:38 +05:30
rohitwaghchaure
8356d4b892 [Fix] disable_rounded_total not found error (#15113) 2018-08-09 15:51:11 +05:30
rohitwaghchaure
ba62013cbb [Fix] Not able to delete the task even if task removed from the project (#15105)
* [Fix] Not able to delete the task even if task removed from the project

* [Fix] Custom field's data in task not updating from the project
2018-08-09 15:50:23 +05:30
Nabin Hait
2a774fa0ac minor fix 2018-08-09 11:50:34 +05:30
Nabin Hait
6a5695fe17 minor fix 2018-08-09 11:30:21 +05:30
rohitwaghchaure
59de1dae6a [Fix] Math domain error (#15107) 2018-08-09 10:58:37 +05:30
Nabin Hait
9a33bc6417 optimizing transactions by caching 2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049 [optimize] tree conditions for pricing rule 2018-08-08 18:43:04 +05:30
Himanshu Mishra
859d942b22 Cached calls (#15109)
* [optimize]: bin updates

* [optimise]: use frappe.get_cached_value instead of get_value for item

* [fix]: change db.get_cached_value to get_cached_value
2018-08-08 18:33:50 +05:30
Himanshu Mishra
f56aac65e1 [optimize]: bin updates (#15108) 2018-08-08 18:32:03 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Rushabh Mehta
4d0b8da0e5 fix(style): modal for website 2018-08-08 14:48:02 +05:30
Nabin Hait
84c7c77009 [optimize] Get defaults from item group based on doc 2018-08-08 14:30:44 +05:30
Nabin Hait
3f142b874a item defaults based on caching 2018-08-08 13:02:59 +05:30
ahmad zaqout
63a741e5c8 fix throw_overlap_error in Shift Assignment (#15103)
fix throw_overlap_error in Shift Assignment
2018-08-08 10:36:40 +05:30
Solufyin
3be899caff Item Alternate Image Features in e-commerce site. (#15044)
* [ADD] Added Item Alternate Image Features in e-commerce site.

* [IMP] Improved Code for Item Alternate Image Feature.

* [IMP] Improved code for Item alternative image functionality.

* Remove .css file and make a build for erpnext-web.css

* Cleanup styling for item alternate image, also add delegated handler

* Spaces -> Tabs

* Spaces -> Tabs in item.html
2018-08-07 18:28:39 +05:30
rohitwaghchaure
8f0acf30bf Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:53:21 +05:30
Rohit Waghchaure
9a9974f5c3 [Fix] 'ascii' codec can't encode error in balance sheet report 2018-08-07 16:51:56 +05:30
Ameya Shenoy
c63e0f9902 Merge pull request #15100 from codingCoffee/splitissue2
[fix] Split issue
2018-08-07 16:43:35 +05:30
Ameya Shenoy
f2e73dd687 [fix] Split issue
take reference name from communication
2018-08-07 16:34:37 +05:30
Meritsystems
1ad8eca4e8 Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895)
* Update point_of_sale.py

* Update point_of_sale.py

Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.

* New field " Display Items in Stock" added

* Update point_of_sale.py

* Update point_of_sale.py

ORM used instead of SQL
used Bin to find actual quantity balances.

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py
2018-08-07 14:38:50 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c [hub][fix] Category page api call 2018-08-07 12:56:56 +05:30
Saurabh
91cecf8eac Merge branch 'hotfix' 2018-08-07 12:55:51 +05:30
Saurabh
6ec558bd59 bumped to version 10.1.46 2018-08-07 13:25:51 +06:00
Prateeksha Singh
318cca8cae [hub] Add 'See All' for Category items
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622 Add Products by Seller 2018-08-07 12:02:14 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
Prateeksha Singh
658d1bbae2 Fix product header styles 2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4 Home: Category-wise Items 2018-08-06 18:31:26 +05:30
Prateeksha Singh
b614ece991 [hub] Move sync, correct legacy code 2018-08-06 17:48:45 +05:30
Zarrar
2cadb1e12e add tax withholding & loyalty program in explore view (#15074) 2018-08-06 14:46:16 +05:30
Doridel Cahanap
59e4c32e9f Allow Disabling Batch and edit Validations (#15076) 2018-08-06 14:45:18 +05:30
Shreya Shah
11dd3ffdb5 Force delete item on deletion of Lab test template (#15079) 2018-08-06 14:43:00 +05:30
Shreya Shah
f0ef673498 Accounts receivable aging based on supplier due date (#15080)
* Accounts receivable aging based on supplier due date (#13801)

* Remove spaces
2018-08-06 14:42:35 +05:30
Charles-Henri Decultot
614959d5f8 Correction of the get_price method for pricing rules (#15082)
* Addition of currency arg in get_price

* Change Price to Rate
2018-08-06 14:42:04 +05:30
Jignesh Greycube
ef961746c1 Spelling updated from Maxiumm to Maximum (#15093)
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:46 +05:30
rohitwaghchaure
57d07d6b8e Merge pull request #15097 from rohitwaghchaure/incorrect_tax_amount_in_report
[Fix] Incorrect tax amount calculation because of same fieldname in the code
2018-08-06 14:32:44 +05:30
Jignesh Greycube
56027e3799 Spelling updated from Maxiumm to Maximum (#15092)
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:31 +05:30
Jignesh Greycube
cb66f6904f Spelling updated from Maxiumm to Maximum (#15091) 2018-08-06 14:32:19 +05:30
Jignesh Greycube
b2d16aca74 Updated Spelling Maxiumm to Maximum (#15090) 2018-08-06 14:32:05 +05:30
rohitwaghchaure
fc682c86c6 [Fix] Inactive student validation issue while disabling the student group (#15095) 2018-08-06 14:29:46 +05:30
Rohit Waghchaure
15f52e7b71 [Fix] Incorrect tax amount calculation because of same fieldname in the code 2018-08-06 14:29:34 +05:30
KanchanChauhan
7fb8540b70 Get item defaults from item group (#15089) 2018-08-06 14:29:14 +05:30
Prateeksha Singh
a5f6e54b70 fix merge conflict 2018-08-06 13:56:53 +05:30
Prateeksha Singh
733433c91e Merge pull request #15094 from frappe/search-injection-fix
prevent jinja exec in search title
2018-08-06 13:05:29 +05:30
Prateeksha Singh
0c796229dc prevent jinja exec in search title 2018-08-06 12:33:34 +05:30
Ameya Shenoy
26bfede116 Merge pull request #15078 from rohitwaghchaure/task_email_alert_not_working_from_project
Fix] Task's email alert on status change not working if we change the task status from the project form
2018-08-06 12:33:07 +05:30
Daniel Chalmers
5037e0d1ed link to license.txt (#15085) 2018-08-06 11:19:45 +05:30
Ranjith Kurungadam
752fd5a7a0 Tests SO for Serial No based delivery (#15072)
* fix remove SO from Serial No only when voucher SE

* SO tests - delivery by Serial No
2018-08-03 10:39:51 +05:30
Rohit Waghchaure
86217ca96c [Fix] Task email alert on status change not working if we change the task status from the project form 2018-08-02 16:41:53 +05:30
Prateeksha Singh
106856b1ab Show View count on items 2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651 [hub] Company (Seller) page 2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47 Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6 Messages: first cut 2018-08-01 19:19:53 +05:30
KanchanChauhan
e1f0be6da5 Delivery Date Change based on Delivery Date change in child table (#15068) 2018-08-01 18:11:58 +05:30
rohitwaghchaure
ae4ff5a403 [Fix] In words showing grand total instead of rounded total (#15065) 2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b Get Advances and auto allocate (#14970) 2018-08-01 18:07:39 +05:30
Ranjith Kurungadam
d54991d624 Delivery by Serial No (#15030)
* fields added for delivery by Serial No

* SO - validate item for delivery by Serial No

* Stock Entry - add Serial No on production, validate reserved consumption

* add item by reservation to transaction if delivery by Serial No

* SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice

* Sales Order - validate Ensure Delivery by Serial No

* Serial No -  remove SO ref on cancel
2018-08-01 17:47:07 +05:30
rohitwaghchaure
0452b405f4 [Fix] Not able to submit the expense claim (#15057) 2018-08-01 17:45:51 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064)
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
2018-08-01 17:45:05 +05:30
Nabin Hait
e45ec661ea Additional fields in Item Price (#14540)
* [IMPROVEMENT] Item Price New Fields and Features

* [IMPROVEMENT] Item Price

 - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
 - Stock Setting to accept Default Price List for Purchase or Sales Item
 - Move Item Section in Item Price

* Fetch default Item Price based on Customer as null

* test fixes

* Code cleanup and fixed the issue of incorrect item price fetched against the customer

* Removed min qty from packing_increment calculation

* Removed auto_update_price_list_rate from the stock settings

* Revert sales_order.json changes

* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings

* Removed unnecessory file

* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f [hub] make get_items generic, add legacy.py 2018-08-01 17:32:13 +05:30
Prateeksha Singh
4d4791ab39 [chore] remove imports 2018-08-01 16:42:09 +05:30
Prateeksha Singh
b4e9ec33cb Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6 [restructure] make api.py 2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27 Prevent access of registered routes 2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed Add generic action handler to subpage 2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383 Rename base_page to subpage 2018-08-01 15:57:13 +05:30
Faris Ansari
fbe9a46d51 Add Marketplace link to user dropdown in toolbar 2018-08-01 15:56:39 +05:30
Nabin Hait
7d9a1db97a Update buying_settings.json 2018-08-01 15:26:40 +05:30
Faris Ansari
709a4a3f4e Break marketplace.js into multiple files 2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e Item Menu dropdown 2018-08-01 13:35:32 +05:30
Faris Ansari
a12076e0fd Convert image to base64 before sending Item to sync 2018-07-31 23:06:00 +05:30
Faris Ansari
057839298c fix get_category call 2018-07-31 19:06:11 +05:30
Nabin Hait
06029194cb Patch fixes 2018-07-31 18:16:11 +05:30
Faris Ansari
300c07c3d9 Use hub.call for categories and favourites 2018-07-31 18:02:13 +05:30
Faris Ansari
1ff25279bf Remove old hub styles 2018-07-31 17:59:03 +05:30
Faris Ansari
c1438c6169 refactor(hub connection): read only connection
- Seller activity in Activity Log
- Move hub_url to site_config
2018-07-31 17:51:45 +05:30
Nabin Hait
14ad9f70b5 Patch fixes 2018-07-31 17:33:14 +05:30
rohitwaghchaure
dc7004e083 [Fix] Patient Appointment Calendar not showing data properly (#15052) 2018-07-31 16:01:02 +05:30
amrabdelkader7
ef52e8ab64 Staging fixes (#15051)
* Update hooks.py

* modified date for reload_doc (#15027)
2018-07-31 15:13:37 +05:30
Nabin Hait
65bb91d1c7 Merge branch 'develop' into staging-fixes 2018-07-31 15:13:30 +05:30
Faris Ansari
b1d6f94cdf Merge branch 'hub-redesign' into hub-redesign-contact-seller 2018-07-31 14:54:58 +05:30
Fisher Yu
13aec3aecb Simplified Chinese Translation Update (#14992)
* delete the old version to be replaced by a new one

* New version of the translated simplified Chinese
2018-07-31 13:29:35 +05:30
Nabin Hait
eed3d4c1b3 Fixed Merge Conflict 2018-07-31 12:36:16 +05:30
Nabin Hait
ebdefade9b Merge branch 'hotfix' 2018-07-31 12:18:23 +05:30
Nabin Hait
e9afbfde76 bumped to version 10.1.45 2018-07-31 12:48:22 +06:00
Faris Ansari
2ae80fd000 wip 2018-07-31 12:02:20 +05:30
Prateeksha Singh
425356c21c [hub] remove test code 2018-07-31 10:45:53 +05:30
Nabin Hait
d53c2c031d more payroll improvements and tests fixes 2018-07-30 20:17:15 +05:30
rohitwaghchaure
1fa5698798 [minor] Freeze the screen to avoid multiple time clicks (#15047) 2018-07-30 19:11:43 +05:30
rohitwaghchaure
086da451ca Removed academic term from validation to check duplicate program enrollement (#15046) 2018-07-30 19:11:14 +05:30
Nabin Hait
d305a7a959 Made leave application importable 2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805 Payroll entry ux improvements and processing via background jobs 2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754 Fixed conflict 2018-07-30 16:37:07 +05:30
Prateeksha Singh
46df72d55d [hub] test progress trigger 2018-07-30 13:24:01 +05:30
Shreya Shah
b2e0f649d2 Merge pull request #15043 from shreyashah115/fix-typo
Fix typo in label
2018-07-30 12:27:19 +05:30
Shreya
21ce5e0609 Fix typo in label 2018-07-30 12:07:46 +05:30
Nabin Hait
9c735e43b0 Grant leaves via modal and backgroud jobs (#15026) 2018-07-30 10:58:49 +05:30
Ameya Shenoy
b8a59547f0 modified date for reload_doc (#15027) 2018-07-30 10:58:19 +05:30
Zarrar
89c87fd6a6 [Minor] Patch fix (#15041)
* update modified date

* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Zarrar
6004b66797 [Minor] Job Offer UX improvise (#15042)
* job offer ux improv

* Update job_offer.js
2018-07-30 10:57:13 +05:30
Nabin Hait
cce7c5c245 Fixed salary structure employee patches 2018-07-30 10:52:51 +05:30
rohitwaghchaure
91d2ace9bb Account no + account name in trial balance and financial statements reports (#15038) 2018-07-30 10:38:51 +05:30
Prateeksha Singh
efbd2ee3f5 [hub] Realtime Sync Progress
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
2018-07-30 09:17:14 +05:30
Prateeksha Singh
811cc3f78f [hub] resolve merge conflicts 2018-07-29 18:05:07 +05:30
Prateeksha Singh
d27b27f88a Hub Seller Profile and Timeline
- profile details fetched from server
- timeline updates on publishing items
2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e [hub] Track Hub Sync on the Server
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
2018-07-29 14:40:52 +05:30
Faris Ansari
296848cb69 Publish Page
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5 Push review area to bottom 2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90 [hub] differentiate self-published items 2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10 [hub] Item page skeleton 2018-07-28 12:25:14 +05:30
Shreya Shah
91a9ee5179 Merge accounts functionality (#14993)
* Add dialog to merge accounts

* Add conditions and merge functionality

* Fix travis

* Add test case

* Add more test scenarios
2018-07-28 10:26:11 +05:30
Prateeksha Singh
dd8045759f [hub] Published Products Page 2018-07-28 01:54:51 +05:30
Prateeksha Singh
83d60ffa1d [hub] update hub item mapping 2018-07-28 00:07:25 +05:30
Prateeksha Singh
6e7fb71f1f [hub][patch] reset publish_in_hub for all items 2018-07-27 22:02:47 +05:30
Faris Ansari
19d40cafba Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-27 21:51:31 +05:30
Faris Ansari
b7a63ab81e Homepage
- show random items from each hub seller
- show items from country
- move add_review method on hub
2018-07-27 21:51:26 +05:30
Prateeksha Singh
f4fbf5215b [hub][search] empty search and route fallback 2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b SearchPage 2018-07-27 15:33:00 +05:30
Shreya Shah
749094dd52 Translatable UOMs (#15024) 2018-07-27 12:54:34 +05:30
Nabin Hait
fa06ee80e9 Fixed merge conflict 2018-07-27 12:54:00 +05:30
Nabin Hait
11137850cb Merge branch 'hotfix' 2018-07-27 12:35:42 +05:30
Nabin Hait
584153a1b1 bumped to version 10.1.44 2018-07-27 13:05:42 +06:00
Shreya Shah
eed0a4e2df Do not copy remarks field while duplicating (#15023) 2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd
f5cc1bd44c Created Eway Bill Report (#14926)
* Created Eway Bill Report

* Field value changes

* Changed module from Stock to Regional

* Added comments and minor fix

* minor fix
2018-07-27 11:21:42 +05:30
Yaqin Shurrab
cc56ff5c37 Get the correct Summation of Closing Balances (#14990)
Fix total raw values for Closing Credit and Closing Debit
2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3 [Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994) 2018-07-27 11:03:53 +05:30
mist-01
9821d51e31 Updated appointment availability to consider appointment duration in healthcare domain (#15011)
* Updated appointment availability to consider appointment duration in healthcare domain.
Fix bug - must clone moment before adding time to avoid updating original moment

* Add spaces after comments
2018-07-27 11:02:03 +05:30
Shreya Shah
1f4c263a63 [minor] Program Enrollment Tool (#15013)
* Make academic term field mandatory

* Add disabled field to Student Group

* Mandatory check in Education Settings for Academic Term

* Fix as per review
2018-07-27 10:59:14 +05:30
Shreya Shah
f71d18a35a Increase margin (#15016) 2018-07-27 10:57:32 +05:30
Nabin Hait
d0a2b1619b Optimization for marking student attendance 2018-07-27 10:51:55 +05:30
rohitwaghchaure
0fe6ced99d [Fix] Valuation rate for serialized items (#15017) 2018-07-27 10:33:30 +05:30
Zarrar
4282729c72 delete version log while deleting company transaction (#15021) 2018-07-27 10:32:17 +05:30
Faris Ansari
24d5f17255 NotFound page for marketplace 2018-07-26 19:22:58 +05:30
Faris Ansari
9d1b7d493a [patch] Delete old hub page 2018-07-26 18:54:58 +05:30
Faris Ansari
b5ce1976b8 Move marketplace code back to marketplace.js 2018-07-26 18:46:38 +05:30
Faris Ansari
521fe4d01d Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-26 18:39:34 +05:30
Faris Ansari
cae856cbda Add marketplace back to hub_listing 2018-07-26 18:39:28 +05:30
Faris Ansari
f4884f8108 Marketplace
- Cache hub calls
- call_hub_method using FrappeClient connection
- Become a seller UX fixes
2018-07-26 18:37:01 +05:30
Faris Ansari
2ca5afa214 Move marketplace ui to marketplace.js 2018-07-26 18:35:04 +05:30
Prateeksha Singh
d885248309 [hub] remove sync_in _progress set 2018-07-26 18:21:33 +05:30
Prateeksha Singh
bcd7077342 [hub] remove sync_in_progress set 2018-07-26 18:20:58 +05:30
Prateeksha Singh
d450c0ac08 [hub][publish] in_progress/empty state 2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288 [hub] sync in progress 2018-07-26 16:25:22 +05:30
Ranjith Kurungadam
e555b5bcf2 Salary Slip tests for tax calc on benefits, additional salary (#14985)
* tests for tax calc on benefits, additional salary

* fix tests - remove created additional salary
2018-07-26 14:39:59 +05:30
Prateeksha Singh
d1224ca662 [hub][init] add profile page 2018-07-26 13:39:06 +05:30
Nabin Hait
8173d9f17a Update additional_salary.json 2018-07-26 12:20:05 +05:30
Saurabh
f86224e6f7 Merge pull request #14945 from chdecultot/gocardless_corrections
Gocardless improvement and  payment request correction
2018-07-26 11:41:43 +05:30
Faris Ansari
195436093d Merge pull request #15004 from netchampfaris/hub-factory-syntax
Fix Syntax Error in hub_factory.js
2018-07-26 10:57:02 +05:30
Prateeksha Singh
f26177bdbc [hub] setup publish items flow 2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e [hub][publish] add search, fix multiple append 2018-07-26 08:36:33 +05:30
Prateeksha Singh
505f6f14e9 [hub][publish] select/deselect all items 2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a [hub] registered vs read-only views 2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75 [hub][init] add publish items page 2018-07-25 20:02:12 +05:30
Nabin Hait
22fa99d040 Payroll Fixes 2018-07-25 18:21:39 +05:30
Nabin Hait
e50e0e4b30 Update repost_reserved_qty_for_production.py 2018-07-25 17:49:47 +05:30
Faris Ansari
6b07898ef0 semicolon 2018-07-25 17:07:26 +05:30
Faris Ansari
ed1190126e Fix Syntax Error in hub_factory.js 2018-07-25 16:51:01 +05:30
Prateeksha Singh
bc8caefc19 [hub] add register as a seller page 2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504 Add review area 2018-07-25 00:49:11 +05:30
Zarrar
739542133c Merge pull request #14995 from Zlash65/min-fix
[Minor] Hub Factory class extend fix
2018-07-24 14:53:15 +05:30
Zlash65
617532b2cb Factory: class.extend -> es6 class 2018-07-24 14:20:10 +05:30
Nabin Hait
90bb5f43d5 Added more status in task web form 2018-07-24 11:33:05 +05:30
Ranjith Kurungadam
e51c175aca Fix tests (#14991)
* minor improv in fetching account

* pass name field while creating tds doc

* create tds fixture after creating tds account

* Inpatient Record - Test - Fix

* fix batch query
2018-07-24 11:07:28 +05:30
Faris Ansari
ea2d1b0a19 New page: marketplace
- subpages: home, favourites, item, category
2018-07-23 18:44:46 +05:30
Nabin Hait
4037915b3c Update setup.py 2018-07-23 18:05:55 +05:30
Nabin Hait
797497d22e Fixed web form perm for tasks 2018-07-23 17:58:40 +05:30
Prateeksha Singh
ebb5662cb7 [revert] modules dropdown 2018-07-23 17:04:34 +05:30
Ameya Shenoy
218f2f841e Merge pull request #14920 from codingCoffee/split_issue
Split a given Issue into 2
2018-07-23 16:09:05 +05:30
Ameya Shenoy
769054e00d Split a given Issue into 2
Bugs encountered:
Once the dialog pops up, filling in the subject and pressing RETURN
doesn't work. It fails to read the subject. The primary button needs to
be clicked on. This is a generic issue, not related to this PR

Behaviour:
-[x] Add button on communication to split thread
-[x] Popup asks for new subject
-[x] Copy "Customer", "Sender" and other relevant fields to this issue
-[x] Move thread and replies to new issue

fixes #14600
2018-07-23 10:31:38 +00:00
Nabin Hait
0c0c345678 Added index on SLE based on batch_no, item and warehouse 2018-07-23 14:38:50 +05:30
yimesgen
20a80fee45 Update batch.py (#14905)
* Update batch.py

Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and".

* Update batch.py
2018-07-23 14:36:50 +05:30
Charles-Henri Decultot
6321a6b908 use standard dict method 2018-07-23 08:56:38 +00:00
Alchez
56bd5d8aaa Fix finance book getter error when book doesn't exist (#14987) 2018-07-23 14:16:35 +05:30
Shreya Shah
cd717e422f Modify renaming process of Account (#14839)
* Disable renaming for Account Master

* Update account name along with account number

* Fix as per suggestions

* Update account.js

* Fix typo

* Remove after_rename and before_rename methods

* Modify test case

* Modify field placement

* Remove unused method
2018-07-23 14:15:20 +05:30
Nabin Hait
851ac754f7 minor fixes 2018-07-23 13:09:02 +05:30
Jamsheer
425fb4c5f4 [Feature][Enhance] Healthcare Inpatient (#14940)
* New DocTypes - Inpatient Record and Healthcare Service Unit Type

* Patient Appointment - Button - Get Prescribed Procedure - hide after save

* Patient Encounter - Schedule Inpatient button

* Inpatient - Healthcare Fields and references

Conflicts:
	erpnext/healthcare/doctype/lab_test/lab_test.json
	erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
	erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
	erpnext/healthcare/doctype/vital_signs/vital_signs.json

* Healthcare Service Unit Type - Item Creation - UOM Fix

* Healthcare Service Unit - healthcare service unit type fix

* Inpatient Record - Admission Scheduled and Discharge Scheduled status

* Patient - rename field inpatient to inpatient_status

* Inpatient Record - rename field inpatient to status

* Refactor - Inpateint Occupancy

* Remove unused imports

* Healthcare service unit - patch - fix

* Healthcare IP - Codacy Fix

* Inpatient Record - Encounter and Practitioner References

* Patch - add healthcare service unit tree - enhance

* Healthcare Setup - Remove - Lab Test and Item creation

* Discharge note in Inpatient Record

* Codacy fix

* Inpatient Record - Update transfer service unit filter

* Inpatient Record - Test
2018-07-23 13:05:35 +05:30
rohitwaghchaure
6b862fcae5 [Fix] Rounded total is not working in the purchase receipt (#14984) 2018-07-23 13:02:07 +05:30
Saurabh
a638400e5d Merge pull request #14707 from chdecultot/stripe_improvements_4
Stripe Subscriptions
2018-07-23 12:11:58 +05:30
Faris Ansari
f585197045 Cleanup homepage 2018-07-23 11:55:07 +05:30
darthguru
f2d4e33eb5 Fixed IGST ISSUE (#14975)
* Fixed IGST ISSUE

the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it

* Update gstr_2.py
2018-07-23 11:52:26 +05:30
Ranjith Kurungadam
1e90dafef8 fixes Benefit Application, Additional Salary (#14971)
* fix - add Additional Salary if multiple in one slip

* fix - Benefit Appication, None comparison
2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371 fix - assigned Salary Structure query (#14965) 2018-07-23 11:31:46 +05:30
Zarrar
a22e0d0c99 return empty if no stock ledger entry found (#14968) 2018-07-23 11:31:04 +05:30
Shreya Shah
83dfc0a2b1 Add Priority field in issue webform and portal (#14967) 2018-07-23 11:14:00 +05:30
Faris Ansari
789ad180ea Merge pull request #14969 from netchampfaris/financial-statement-reports
Financial Reports fixes
2018-07-21 12:28:31 +05:30
Faris Ansari
b23d15fba9 Fix typo 2018-07-20 18:16:31 +05:30
Faris Ansari
5e096df5ae columnDef => column 2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd Return early if filters not initialized 2018-07-20 16:31:01 +05:30
Prateeksha Singh
abca510f9a Update conf.js 2018-07-20 16:07:50 +05:30
Faris Ansari
5986d59b01 Financial Reports
- Update formatter for use with DataTable
- Fetch Currency from  filters and fallback to company currency
2018-07-20 15:11:55 +05:30
Charles-Henri Decultot
39418b1532 CSS correction due to latest version of develop 2018-07-20 09:37:22 +00:00
Rushabh Mehta
ce6e27a066 [minor] frappe 2018-07-19 17:47:04 +05:30
KanchanChauhan
0c3d345a9f [Minor] Moved mandatory Company field from More Information section to top (#14950) 2018-07-19 14:39:31 +05:30
Ranjith Kurungadam
dff2ba72d3 test TDS calculation (#14919)
* test TDS calculation

* fix failing test cases

* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
a8e24cba46 Merge patch and delete fields from subscription (#14941)
* Delete subscription records after migrating all records to auto-repeat

* delete old fields from subscription
2018-07-19 14:33:31 +05:30
Saurabh
139d165258 Merge pull request #14962 from saurabh6790/staging_version_1
Update staging version to support semantic versioning
2018-07-19 13:38:34 +05:30
Saurabh
dfdad651ea Update staging version to support symentic versioning 2018-07-19 13:36:32 +05:30
Saurabh
63f87441c8 Update hooks.py 2018-07-19 13:13:15 +05:30
Nabin Hait
9c5afc3620 website permission for support portal 2018-07-19 13:02:36 +05:30
Nabin Hait
47ce481394 Minor fix 2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be [fiscal-year] use to_date property 2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707 [fix] format fiscal year docname to proper date before using 🤦 (#14955) 2018-07-18 18:03:27 +05:30
Saurabh
d9d8dda5da Merge pull request #14954 from saurabh6790/conflict_fixes
[minor] remove conflicts
2018-07-18 17:21:54 +05:30
Saurabh
0bfbf8aa6f [minor] remove conflicts 2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Saurabh
8ca5940f76 Merge branch 'hotfix' 2018-07-18 16:24:54 +05:30
Saurabh
6c46b4edc4 bumped to version 10.1.43 2018-07-18 16:54:54 +06:00
Shreya Shah
8395a7ad6f Modifications in last purchase rate button (#14948)
* Make last purchase rate button visible until submitted

* Move buttons

- Get last purchase rate and link to material request buttons moved to toolbar under Tools button

* Remove disable fetch last rate functionality

* Make last purchase rate field read_only
2018-07-18 12:27:27 +05:30
Shreya Shah
9baa3bef8b [Portal] Display issues raised by all users of a customer (#14947)
* Display issues raised by all users of a customer

* Fixed as per review
2018-07-18 12:25:38 +05:30
Faris Ansari
9e874af9ba Query report print (#14935)
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57 Gocardless improvement and payment request correction 2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def [minor] fixes + patch (#14937) 2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832 Defaults in Item Group (#14874)
* Add Defaults table in Item Group

* Fetch defaults from Item group if not found in Item

* Add patch

* Remove default fields from Item Group

* Set query for defaults

* Fix Codacy

* Modify test records

* Modify budget.py and sales_order.py

* Remove join from query

* Else condition to avoid error if no defaults found

* refrain from making item test records before item_group

* default cost center fetch correction

* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790 Naming series increase even if there is an exception while saving the invoice from the backend (#14938) 2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1 [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899)
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order

* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
af479c8192 set valid delivery date (#14890)
* set valid delivery date

* calculate delivery date based on diffrence in transation date and delivery date of ref doc
2018-07-17 16:49:32 +05:30
rohitwaghchaure
216f9373c9 Provision to select the cost center in the asset (#14934) 2018-07-17 16:47:51 +05:30
Shreya Shah
663b435919 Update modified time to fix patch (#14931) 2018-07-17 16:47:18 +05:30
Saurabh
e78a877202 patch fixes (#14936) 2018-07-17 16:38:11 +05:30
Nabin Hait
1e693fe6c9 Replaced spaces with tabs 2018-07-17 16:08:39 +05:30
Nabin Hait
26786bd35d minor route fix for general ledger 2018-07-17 15:59:15 +05:30
rohitwaghchaure
5fe88ea93e [Fix] Not able to update the current value of the prefixes which are defined in the autoname field (#14918) 2018-07-17 12:45:25 +05:30
Shreya Shah
fbeab5bf73 Show opening balance of leaves (#14925)
* Show opening balance of leaves

* Update employee_leave_balance.py
2018-07-17 11:59:51 +05:30
Ameya Shenoy
8ba1310915 [fix] Location test (#14921) 2018-07-17 11:57:49 +05:30
Zarrar
fc0a5833a5 run set query if doctype exist (#14929) 2018-07-17 11:57:06 +05:30
Faris Ansari
107dbcdff8 Merge pull request #14917 from frappe/surajshetty3416-patch-1
Fix typo
2018-07-16 18:42:34 +05:30
Suraj Shetty
a6f984366a Fix typo 2018-07-16 18:39:01 +05:30
Zarrar
26c9b94cc6 [ Improv ] Loyalty Program more fixes and test case (#14888)
* remove console statements

* set account & cost center for redemption

* add test case for single/multi tier & is_return scenario

* reset tier when changing loyalty program

* make loyalty fields non copy type

* fix test case - delete si after every test to avoid interference
2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b [Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914) 2018-07-16 18:11:19 +05:30
Suraj Shetty
6dfc165193 Add patch to skip user perm check for doctype (#14873)
* Add patch to skip user perm check for doctype

Skip user permission check for doctypes where
department link field was recently added

* Remove new doctype entries

* Skip doctypes if department field already exists (custom field)

* Add patch to set department value based on employee

* Update set_department_for_doctypes.py

* Update skip_user_permission_check_for_department.py
2018-07-16 18:10:16 +05:30
Jamsheer
f926911399 [Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot

* Role name change

* Rename DT - Physician Schedule to Practitioner Schedule

* Rename DT - Physician Service Unit Schedule

* Rename DT - Physician to Practitioner

* Lab Test Template - field disabled in standard filter

* Patient - customer creation fix

* Rename DT - Consultation - Encounter

* Patches.txt updated for rename doctypes and fields in Healthcare

* Patch - Rename doctypes and fields in Healthcare Domain

* Fix - Patch - rename_healthcare_doctype_and_fields

* Vital Signs - New Fields - Abdomen, Tongue and Reflexes

* Web Form - Patient - Personal Details

* Rename DocType Physician to Healthcare Practitioner

* Rename DocType Consultation to Patient Encounter

* Web Form - Personal Details - Fix

* Web Form - Personal Details - Codacy Fix

* Healthcare patch run for all domain

* Rename label Practitioner to Healthcare Practitioner

* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Ranjith Kurungadam
14e94f824e fix - HRA India (#14911) 2018-07-16 16:12:46 +05:30
Shreya Shah
ffd2254944 Make item defaults non-collapsible (#14908) 2018-07-16 14:55:54 +05:30
Nabin Hait
656016b4e0 Reloaded location doctype in patch 2018-07-15 20:10:23 +05:30
rohitwaghchaure
526ab2ca30 [enhance] Allow transfer for manufacture in the BOM (#14891)
* [enhance] Allow transfer for maufacture in the BOM

* Added patch

* Fix codacy

* Fixed typo and added test cases
2018-07-15 20:04:41 +05:30
Zarrar
f579a2bd5d [Minor] Fix Crop Cycle test record (#14901)
* fix crop cycle test record

* load crop cycle doc if not yet loaded

* create test records for location

* land unit -> location , update in patch for tree index
2018-07-15 20:04:24 +05:30
Charles-Henri Decultot
3fa3104dcc Debug cleanup 2018-07-13 14:00:42 +00:00
Charles-Henri Decultot
c047bf88db Rebase following Subscription corrections 2018-07-13 13:25:53 +00:00
Charles-Henri Decultot
7722b81c8e Variable correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a0b7236f66 Corrections following Saurabh's comments 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
90669a03b3 Test correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
da8b11fd12 Travis correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
8b3e841fbf Travis correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6 Review corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3 Test correction 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a Codacy corrections 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
bbed5d41ca Remove remaining images 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
63e1dd5993 Remove doc 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3 Dev cleanup 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7 Remove payment plan reference 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631 Subscription integration 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9 Corrections to Subscriptions 2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d Stripe integration corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a45ea63b5d Codacy correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6c2ad66522 Codacy corrections 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a27673ecfe Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
79380c6a74 Travis correction 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
30da37fbb8 Move Stripe to ERPNext 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
e25d2ee66d Update Stripe Documentation 2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad Payment Request modifications 2018-07-13 13:05:54 +00:00
Nabin Hait
03b597418a Patch order fixed 2018-07-13 17:45:27 +05:30
Saurabh
3d825e5689 Subscription test and fixes (#14875)
* Add dashboard on subscriber screen

* Add Subscription and Subscription Plan to Account Dashboard

* Fetch customer name while creating subscriber

* [fix] add section for Subscription Period

* minor fixes

* optimization
2018-07-13 17:41:36 +05:30
rohitwaghchaure
3ffe89659a [Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879) 2018-07-13 17:40:48 +05:30
Nabin Hait
d2e42d3d86 Merge branch 'update_qty_rate' into develop 2018-07-13 17:02:40 +05:30
Nabin Hait
b2da082798 Fixed logic and tests 2018-07-13 17:02:08 +05:30
Doridel Cahanap
6f06cc27e6 Update Qty and Rate in PO and SO 2018-07-13 17:02:08 +05:30
Alchez
df1eae8981 Merge the Land Unit doctype with the Location doctype (#14613)
* Merge Land Unit with the Location doctype

* Fix patch

* [minor] modification to Location structure

- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
2018-07-13 12:50:04 +05:30
Ameya Shenoy
5c3b69476d shift to self-hosted frankfurter api (#14792) 2018-07-13 12:46:07 +05:30
KanchanChauhan
09e680b4aa [Fix] Should not get approvers for disabled Departments (#14868) 2018-07-13 12:26:56 +05:30
Faris Ansari
b86e5cbc42 Update travis badge (#14869) 2018-07-13 12:25:45 +05:30
Nabin Hait
da17ceea73 patch fixes 2018-07-13 12:04:06 +05:30
Ameya Shenoy
a559b0de5a Role modifications for Shareholder (#14872)
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
2018-07-13 11:34:19 +05:30
Saurabh
b6d5f1fea1 [fix] add staging version (#14871) 2018-07-13 11:33:31 +05:30
rohitwaghchaure
2d84945839 [Fix] Stock reconciliation wrong difference amount calculation (#14893) 2018-07-13 11:07:27 +05:30
Prateeksha Singh
0c51d40ad0 Merge pull request #14889 from pratu16x7/support-portal
[fix][minor] search help alignment
2018-07-12 16:06:49 +05:30
Prateeksha Singh
4cc7957a2a [fix][minor] search help alignment 2018-07-12 16:05:57 +05:30
Shreya Shah
8dc4c945dc Fix UX (#14862) 2018-07-11 14:36:49 +05:30
Zarrar
5899d98077 [ Major ] Loyalty Program Fixes (#14863)
* fix checking of customer_group & territory of customer in loyalty program

* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options

* removed disabled field, added from_date & to_date

* loyalty program section made collapsible, added redeem check in it

* setting loyalty program improvised, manual selection if multiple found

* get_query added, amount calculation updated

* args passed rectified for expiry_date

* get loyalty_points logic improv, redemption_details logic added

* improv based on from/to date and other rectification

* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867)
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
2018-07-11 14:34:55 +05:30
Saurabh
e8345f9ae0 add key to trace beta version (#14859) 2018-07-10 19:05:38 +05:30
rohitwaghchaure
cc9c7d5e2a [Fix] GSTIN not displaying in the address print (#14855)
* [Fix] GSTIN not displaying in the address print

* Made changes in the patch and set Patch as False

* Update update_address_template_for_india.py
2018-07-10 15:41:42 +05:30
Alchez
9155e40bc7 [Fix] Set default CF in case none exist (#14829) 2018-07-09 16:57:42 +05:30
Frappe PR Bot
b48c769588 [Translation] Updated Translations (#14849) 2018-07-09 16:56:49 +05:30
rohitwaghchaure
07d0e9a2b2 Don't show disabled items in the stock balance report (#14851) 2018-07-09 16:56:41 +05:30
Saurabh
db7324890f Merge branch 'master' into develop 2018-07-09 15:53:51 +05:30
Saurabh
f38d6d9c44 Merge branch 'hotfix' 2018-07-09 15:53:50 +05:30
Saurabh
07bb1811af bumped to version 10.1.42 2018-07-09 16:23:50 +06:00
rohitwaghchaure
f07462860b Merge pull request #14846 from shreyashah115/fix-digest
Filter out pending orders based on company
2018-07-09 14:48:13 +05:30
Ranjith Kurungadam
ea089d67ce Employee Benefit Application - fix (#14837) 2018-07-09 14:01:18 +05:30
rohitwaghchaure
720b06495c [Fix] Not able to save project (#14848) 2018-07-09 13:57:16 +05:30
Shreya
83ad646af4 Filter out pending orders based on company 2018-07-09 12:14:03 +05:30
rohitwaghchaure
8179bcbabd [Fix] Code cleanup (#14843) 2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a [Fix] Unable to print Salary Register (#14844) 2018-07-09 09:28:56 +05:30
rohitwaghchaure
6be8bea934 Provision to view return entries in Sales Person-wise Transaction Summary (#14830) 2018-07-08 19:25:13 +05:30
Shreya Shah
21d3352aa2 Merge pull request #14835 from shreyashah115/print-hide
Print hide loyalty program related fields
2018-07-06 18:36:47 +05:30
Zarrar
8111705f82 Merge pull request #14833 from Zlash65/min-ac-fix
[Minor] Change field name in Accounts utils
2018-07-06 18:24:55 +05:30
Shreya
9bcb959f81 Print hide loyalty program related fields 2018-07-06 18:17:02 +05:30
Shreya Shah
c8c17ff5cf Return if Item Defaults exist (#14834) 2018-07-06 18:07:28 +05:30
Zlash65
1aeca1d349 change name that fetches numbered value from acc & cc 2018-07-06 17:15:33 +05:30
Zarrar
17705f932d [ Minor ] Cost Center Number field added in field's dialog (#14781)
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function

* rename function's name appropriately
2018-07-06 14:44:44 +05:30
Alchez
8f2a0f3d79 [Fix] Incorrect assignment of Serial No in POS Invoice (#14772)
* Fix incorrect assignment of serial no in Sales Invoice through POS

* Add conversion factor to quantity check
2018-07-06 14:36:52 +05:30
Ranjith Kurungadam
6429ba9ed9 Payroll Entry - fix query, get assignment by end date (#14827) 2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Saurabh
0b9129e519 Merge branch 'hotfix' 2018-07-06 13:02:58 +05:30
Saurabh
778e06d0ee bumped to version 10.1.41 2018-07-06 13:32:57 +06:00
rohitwaghchaure
3f5e80ebe3 Allow bulk edit for the sales invoice item (#14826) 2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd Loyalty Program (#12631)
* First Cut for the Loyalty Program

* finished the collection part

* redmeption for the loyalty point

	update the loyalty point entry in the FIFO style
	make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
	update the outstanding balance in the client side

* completed for the desk viewe

* wrap up for the desk and shopping cart

* pos

* fix and test the travis
2018-07-06 12:36:57 +05:30
rohitwaghchaure
ea943c6fe4 [Fix] Due date validate issue in the POS (#14825) 2018-07-06 12:28:58 +05:30
Ranjith Kurungadam
5d134e0465 TDS Calculate tax for whole period on deduct checkboxes (#14824)
* Tax Exemption Proof Submission - fields submission_date, exemption_amount

* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary

* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
2018-07-06 11:57:32 +05:30
rohitwaghchaure
839320dca5 [Fix] Original Invoice outstanding is not updating after making Debit Note (#14821) 2018-07-06 10:42:15 +05:30
Andrew McLeod
686284261d Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. (#14811) 2018-07-06 10:41:37 +05:30
rohitwaghchaure
82a9fde921 Added compact print option for the material request (#14799) 2018-07-06 10:40:51 +05:30
bobzz-zone
58236ffc1e Update budget_variance_report.py (#14798)
Make sure GL Entry only called once in each row
2018-07-06 10:39:00 +05:30
Saurabh
b35721029b Merge pull request #14820 from saurabh6790/fix_task_status
[fix] Add Overdue status in Project Task
2018-07-06 05:54:47 +05:30
Saurabh
f403031449 [fix] Add Overdue status in Project Task 2018-07-05 19:38:59 +05:30
Rushabh Mehta
df23c7dc0c [cleanup] bunch of UX fixes (#14787)
* [cleanup] add dashboard to leave policy, employee form cleanup

* [test] first_name in employee

* [fix] tests

* [fix] tests

* [fix] tests

* [hr] add more dashboards

* [minor] fixes + ux
2018-07-05 15:19:28 +05:30
Rushabh Mehta
c1b430c8bd [enhance] added priority to issue (#14815) 2018-07-05 11:38:02 +05:30
Rushabh Mehta
2a5dc911e6 [github] remove issue template 2018-07-05 10:47:59 +05:30
Rushabh Mehta
b9b2bc9ace Update PULL_REQUEST_TEMPLATE.md 2018-07-05 10:45:48 +05:30
Zarrar
a3f6856d81 python 3 fix for sorted (#14814) 2018-07-05 10:37:39 +05:30
Nabin Hait
d4453aef68 Fixed permission issue 2018-07-04 16:38:10 +05:30
rohitwaghchaure
25f36489b3 Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 16:26:48 +05:30
Rohit Waghchaure
5005e467a0 [Fix] POS Profile ignore pricing rule not working for online pos 2018-07-04 12:37:38 +05:30
Shreya Shah
430810f64c Fix typo (#14802) 2018-07-04 10:17:36 +05:30
Aditya Hase
69711d2df2 Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) (#14803)
This should also fix #13909 as a side effect.
2018-07-04 10:17:17 +05:30
Zarrar
68a148e293 half_day enable/disable check (#14795) 2018-07-03 17:00:38 +05:30
rohitwaghchaure
205eae322b [Fix] BOM replace timeout issue (#14782) 2018-07-03 15:06:38 +05:30
Nabin Hait
24ee7e5eb1 Patch fix 2018-07-03 13:15:47 +05:30
Nabin Hait
9911309631 Patch fixes 2018-07-03 13:06:49 +05:30
Nabin Hait
f4660d2479 Ignore calculating tds if amount/formula is mentioned in salary structure 2018-07-03 13:06:49 +05:30
Ameya Shenoy
935f4a474b Prevent creation of more than 500 item variants (#14790) 2018-07-03 10:48:59 +05:30
Zarrar
c1225a84cc fix css for coa dialog in setup wizard (#14793) 2018-07-03 10:35:31 +05:30
Britlog
4412f10918 Add missing fields in select, the same as in get_product_list_for_group (#14789) 2018-07-03 10:33:49 +05:30
Charles-Henri Decultot
6d97ab6f78 Make fields translatable (#14786) 2018-07-03 10:32:53 +05:30
Shreya Shah
aa62a62bb0 Add VAT related fields after printing settings fields (#14773) 2018-07-03 10:28:20 +05:30
Vishal Dhayagude
0e027a14a7 [minor] Link to Employee Separation template and Onbording template added in HR Module Page (#14748)
* [minor] Link to Employee Separation template and Onbording template added in HR Module Page

* [minor] Employee templated added in Employee Life Cycle Section
2018-07-03 10:20:02 +05:30
Shridhar Patil
4987c4ef53 on delete contact update issue (#14770)
* on delete contact update isuue

remove contact from issue if the deleted contact exists

* moved issue update function to issue.py

* Update formatting and comment
2018-07-03 10:10:04 +05:30
Suraj Shetty
27067b34e1 Rename (#14771)
- Daily Work Summary Settings to Daily Work Summary Group
in hr.py
2018-07-03 10:08:45 +05:30
Shreya Shah
93d60869ed Fix patch (#14769)
Income account instead of expense account
2018-07-03 10:07:32 +05:30
Ranjith Kurungadam
273e8e59ca fix Salary Component (#14783) 2018-07-03 10:05:01 +05:30
Pawan Mehta
e734b7c17b Add filters to show Draft salary slips in salary register (#14780)
* [fix] #14778

* replace if-elif block with inline block
2018-07-03 10:01:19 +05:30
Frappe PR Bot
1baa811a40 [Translation] Updated Translations (#14776) 2018-07-03 09:59:57 +05:30
rohitwaghchaure
afe764264d [Fix] Employee advance issues (#14750) 2018-07-01 16:48:00 +05:30
Charles-Henri Decultot
f02bef78f0 FEC report corrections (#14741)
* Report corrections to match government requirements

* Untranslatable headers

* Remove unused onchange logic
2018-07-01 16:46:48 +05:30
Zarrar
dfe897b888 [ Fix ] UOM Conversion fix (#14768)
* increase precision for conversion value

* inverse the conversion data

* update uom data

* rectify conversion logic according to inversion of values

* rectify test case for uom conversion

* patch improv to correct conversion data
2018-07-01 16:45:53 +05:30
Ranjith Kurungadam
4dc5721ba5 fix - Benefit Application query (#14767) 2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen
8662a4f677 POS - Translate some text & numpad (#14765)
* make label & placeholder translatable

* numpad translatable

* Update point_of_sale.js

remove debugger
2018-07-01 16:44:09 +05:30
Nabin Hait
e3daaa63f0 Payroll fixes (#14758)
* Ignore calculating tds if amount/formula is mentioned in salary structure

* [fix] Paid amount in Journal Entry from Payroll Entry

* fix codacy
2018-07-01 16:43:34 +05:30
Ranjith Kurungadam
b1a756cc9f HRA Indian regional - field basic in company, calc changes (#14757) 2018-07-01 16:42:38 +05:30
rohitwaghchaure
1501a6e58e [Fix] Data missing issue in stock ledger report (#14755) 2018-07-01 16:42:00 +05:30
rohitwaghchaure
01fe4a3726 [Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753) 2018-07-01 16:41:39 +05:30
Manas Solanki
644f404c1b Merge pull request #14759 from ESS-LLP/fix_typo
fix typo
2018-06-29 23:50:39 +05:30
Ranjith
69b03a3b53 fix typo 2018-06-29 20:14:20 +05:30
rohitwaghchaure
c5183b7c2a Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties
[Fix] Patch
2018-06-29 19:02:38 +05:30
Rohit Waghchaure
4178030c99 [Fix] Patch 2018-06-29 17:54:25 +05:30
Ranjith Kurungadam
fd7ef2e15c Salary Component - field display, value dependency (#14747) 2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5 Payroll Entry - make only one JE, separate JE for Flexi (#14752) 2018-06-29 16:48:49 +05:30
Nabin Hait
b192a4af77 reload doc in patch 2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540 Set user permissions for new departments based on company 2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d Set salary component properties in existing components and salary structures 2018-06-29 14:36:45 +05:30
Manas Solanki
f184e35a4a Merge pull request #14746 from frappe/manassolanki-patch-1
Update bom_stock_calculated.py
2018-06-29 13:33:51 +05:30
Manas Solanki
ee32a78e9f Update bom_stock_calculated.py 2018-06-29 13:33:32 +05:30
Nabin Hait
104f62090d Add filters for cost center in Budget Variance report 2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026 Add configurable frequency in Selling Settings for update of project … (#14670)
* Add configurable frequency in Selling Settings for update of project and company

* remove redundant code

* remove redundant code, only trigger calculation if order/invoice is present

* removed dangling commas as per common convention in hooks

* fix:handling multiple documents

* Update selling_settings.json
2018-06-28 23:43:23 +05:30
Nabin Hait
d0c6184e24 minor patch fixes 2018-06-28 23:42:55 +05:30
rohitwaghchaure
191876f51b [Fix] Bank Account mandatory (#14734) 2018-06-28 23:28:58 +05:30
Ranjith Kurungadam
a10f118ddd Payroll Entry - Validate Attendance (#14738) 2018-06-28 23:28:07 +05:30
Nabin Hait
7324815fdb map payment terms template from SO to SI 2018-06-28 23:12:02 +05:30
Charles-Henri Decultot
52fb43fc4f Add no copy to payment terms template (#14725) 2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
97fa94e77d Journal and Entry number correction (#14720) 2018-06-28 23:05:58 +05:30
Cadmandata
d673afccf2 Updated comment in make_stock_entry() function (#14726)
Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.
2018-06-28 23:05:32 +05:30
Ranjith Kurungadam
f6e654eccc Payroll Entry - fix deduct taxes (#14730) 2018-06-28 23:04:51 +05:30
rohitwaghchaure
cae945e743 Added validation and fixes UX for asset (#14727) 2018-06-28 23:04:25 +05:30
Ranjith Kurungadam
6ceed038e6 Fix benefits (#14735)
* Employee Benefit Application - fix typo

* Employee Benefits - fix field renamed
2018-06-28 23:02:58 +05:30
Manas Solanki
3ff7f79cc7 Merge pull request #14740 from manassolanki/fix-20
[minor] fix for the args in the frm.call
2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387 [minor] fix for the args in the frm.call 2018-06-28 20:44:53 +05:30
rohitwaghchaure
631cc30a8b Merge pull request #14736 from rohitwaghchaure/subcontracted_pr_issue
[Fix] Not able to save subcontracted purchase receipt
2018-06-28 18:38:32 +05:30
Rohit Waghchaure
ed71c36748 [Fix] Not able to save subcontracted purchase receipt 2018-06-28 18:36:35 +05:30
Ranjith Kurungadam
b66bde32f8 Payroll Entry - fix only one employee fetched (#14718) 2018-06-28 14:40:29 +05:30
Charles-Henri Decultot
8b22310d66 Allow auto repeat update (#14706)
* Allow auto repeat update

* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1 [ Enhance ] Setup Wizard - Chart of Accounts (#14698)
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart

* read chart from file and make a tree render-able dict of it

* tree method to return node data for coa setup wizard
2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5 Fix error message (#14716) 2018-06-28 14:14:28 +05:30
Pawan Mehta
c7897e491d [fix] #14714 (#14715) 2018-06-28 14:13:56 +05:30
KanchanChauhan
168e66b107 Blanket Order translation fix for DE (#14711) 2018-06-28 14:13:24 +05:30
rohitwaghchaure
e27b85de4f Added test cases for Overproduction against Work Order / Sales Order (#14704) 2018-06-28 12:48:28 +05:30
rohitwaghchaure
4c23be1821 Added test cases for subcontract (#14702) 2018-06-28 11:18:37 +05:30
Prateeksha Singh
4bd6547de8 Merge pull request #14710 from frappe/revert-14708-hub-fixes
Revert "[hub] add link in modules"
2018-06-28 09:59:56 +05:30
Prateeksha Singh
5d227c9028 Revert "[hub] add link in modules" 2018-06-28 09:59:46 +05:30
Prateeksha Singh
84d358bd0a Merge pull request #14708 from pratu16x7/hub-fixes
[hub] add link in modules
2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7 [hub] add link in modules 2018-06-28 03:17:39 +05:30
Manas Solanki
4933e6bfeb Update test_finance_book.py (#14703) 2018-06-27 17:30:09 +05:30
Ranjith Kurungadam
23e235395e Salary Slip - remove check query limited to one (#14699) 2018-06-27 17:29:40 +05:30
Shreya Shah
f2f54e741b Merge pull request #14701 from shreyashah115/testing-1
[minor] Blanket order
2018-06-27 16:00:02 +05:30
Shreya
32b57da335 Make supplier_name and customer_name fields read only 2018-06-27 15:20:33 +05:30
Manas Solanki
1b52a94e8c Merge pull request #14700 from manassolanki/test_finance_book
[test] check the finance book via the journal entry
2018-06-27 15:16:58 +05:30
Shreya
18bed504dc Set target qty 0
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
2018-06-27 15:14:43 +05:30
Manas Solanki
b912374b96 [test] check the finance book via the journal entry 2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3 [Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690) 2018-06-27 11:22:03 +05:30
Ranjith Kurungadam
53cdbe960e Salary Slip - fix query (#14693) 2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c [Fix] - Get payroll period days (#14686)
* Fix - get_payroll_period_days

* Fix - get_payroll_period_days
2018-06-27 11:13:20 +05:30
Deepak kumar
55cf6c5f7e Membership (#14688)
* Correct the label and field name

* Update membership.json
2018-06-27 09:17:33 +05:30
rohitwaghchaure
f3cf15fa0d [Fix] While saving project getting timeout error (#14672) 2018-06-26 17:06:00 +05:30
Nabin Hait
e2a8120ef8 ignore user permissions for some fields 2018-06-26 15:27:34 +05:30
Prateeksha Singh
d53d2ed791 Merge pull request #14679 from pratu16x7/hotfix
[fix] yet another python attribute fetch
2018-06-26 12:20:26 +05:30
Prateeksha Singh
34aeefc0a1 [fix] yet another python attribute fetch 2018-06-26 12:18:29 +05:30
Manas Solanki
7707cee6b7 Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo
Allow only submitted Blanket Order in PO/SO
2018-06-26 11:46:23 +05:30
Manas Solanki
860e169081 Update sales_order.js 2018-06-26 11:45:04 +05:30
Manas Solanki
0ebd0f0d62 Update purchase_order.js 2018-06-26 11:44:29 +05:30
Kanchan Chauhan
bddebb52d6 Allow only submitted Blanket Order in PO/SO 2018-06-26 09:31:27 +05:30
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
Frappe PR Bot
5c13cb3221 [Translation] Updated Translations (#14669) 2018-06-25 15:08:15 +05:30
mnaim-cloude8
56e4346ead To fixed if if no schedule and disposal is NOT within the period. (#14637)
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.

* Update asset_depreciations_and_balances.py
2018-06-25 15:05:26 +05:30
Jamsheer
4f8deb92cc [Fix] - Leave Perid - Grant Allocations (#14668)
* Leave Perid - Grant Allocations - Fix

* Codacy - string statement has no effect
2018-06-25 14:49:54 +05:30
Prateeksha Singh
f845e749f2 Update stale-bot config 2018-06-25 11:06:32 +05:30
Shreya Shah
d8031d1a53 Clear child table before appending (#14648) 2018-06-25 10:34:55 +05:30
rohitwaghchaure
34c187706d [Enhance] Added Budget exception approver role in company (#14645)
* [Enhance] Added Budget exception approver role in company

* Added test cases for budget
2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77 Salary Structure Assignment - remove to_date (#14642)
* Salary Structure Assignment - remove to_date

* fix Salary Assignment - remove to_date

* Salary Slip - fix codacy remove sting based query, add end_date to condition
2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50 [Enhance] Refactor (#14647)
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view

* Salary Component - additional component and flexi not comes in same component

* Salary Structure - refactor validation messages
2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0 [Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649)
* [Fix] POS Closing Voucher, on save collected amount becomes zero

* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Jamsheer
648728f330 Fix - depends on lwp - employee benefit (#14644) 2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389 Employee benefit - Last payroll period benefit (#14634)
* Employee benefit - Last payroll period benefit

* Method name refactor
2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc Added adational filters to Tax Rule doctype (#14639) 2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b Fetch company on employee selection (#14633) 2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20 Added test cases for asset accounting, asset value adjustment (#14572)
* Added test cases for asset accounting, asset value adjustment

* Accounting entry for the asset created manually

* Added asset movement test cases and validation

* Added validation to make asset from purchase receupt, invoice only
2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39 Fix tax calculation (#14635)
* Salary Detail - field is_additional_component

* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax

* fix indentation
2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff Merge branch 'master' into develop 2018-06-22 05:10:29 +00:00
Ameya Shenoy
1098755d26 Merge branch 'hotfix' 2018-06-22 05:10:27 +00:00
Ameya Shenoy
774f676a25 bumped to version 10.1.40 2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa Merge pull request #14629 from pratu16x7/css-fixes
[portal] fix item-preview column #13077
2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7 [portal] fix item-preview column #13077 2018-06-21 22:42:03 +05:30
Ameya Shenoy
1629393618 Merge pull request #14628 from Zlash65/fix-pe
Expense Claim - Payment Entry related fix
2018-06-21 18:49:50 +05:30
Nabin Hait
3ebc15cc8f test fixes 2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea Test case fixes 2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc expense_claim related fix in payment entry
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1 Don't allow to sale asset item from POS (#14623) 2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0 [Tests] Employee Onboarding & Separation (#14606)
* Set query on department

* Add test for Employee Onboarding

* Add fetch for Employee Separation fields

* Add test for Employee Separation

* Fix Staffing Plan test case
2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4 improve performance of stock_value retrieval using tabBin instead of … (#14584)
* improve performance of stock_value retrieval using tabBin instead of stock ledger

* rename fn

* rename fn

* Update warehouse.py
2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62 [Fix] Subscription method (#14604)
* [Fix] Subscription method path

* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125 [Fix] Deferred account must be liability account (#14612) 2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c Merge pull request #14608 from shreyashah115/fix-onboard
[Enhance] Employee Onboarding & Separation
2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68 Compensatory Leave Request (#14611)
* Compensatory Leave Request - Validate Holidays and Attendance

* Compensatory Leave Request - Cancel

* Half Day in Compensatory Leave Request

* Leave allocation on Compensatory Leave Request - Fix

* Unused import
2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b Test case fixes 2018-06-21 11:36:13 +05:30
umaepoch
0484547150 BOM Stock Calculation Report (#14561)
* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* BOM Stock Calculated

* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737 [Minor] Report related fixes (#14620)
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8 Job Applicant Source (#14543)
* New doctype - Job Applicant Source

* Source and source name field in job applicant

* Updated install_fixtures with default options

* Update install_fixtures.py

* Fixes codacy
2018-06-21 10:47:54 +05:30
Prateeksha Singh
ab37c6912c Merge pull request #14621 from pratu16x7/probot
[probot-stale][config] Mark and close inactive PRs
2018-06-21 10:38:16 +05:30
Frappe PR Bot
748c0240db [Translation] Updated Translations (#14615) 2018-06-21 10:34:28 +05:30
Prateeksha Singh
f9284228f1 [probot-stale] add config 2018-06-21 10:28:44 +05:30
Charles-Henri Decultot
fc2292f08c Email alert renamed to Notification (#14618) 2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555 changed fieldname of inventory section break in Item 2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8 Update status if tasks have been completed (#14601) 2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2 Test leave management (#14587)
* test max allowed days in leave policy

* test the leave period

* test leave encashment
2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352 Daily work summary reply report (#14583)
* Add daily work summary reply report

* Show user name instead of email

* Remove print statement

* Change field datatype

* ReRun Travis
2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df minor fix 2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b add missing brand filter to stock balance report (#14597)
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273 Fix codacy 2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8 Update and set status on the basis of project completion 2018-06-20 15:55:27 +05:30
Shreya
a5afd96019 Employee Onboarding and Separation lists 2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Saurabh
e6498996fa Merge branch 'hotfix' 2018-06-20 15:21:40 +05:30
Saurabh
98b7bb5679 bumped to version 10.1.39 2018-06-20 15:51:40 +06:00
Zarrar
99017b173d naming for asset maintenance task should be task name (#14607) 2018-06-20 14:53:13 +05:30
Ranjith Kurungadam
c1030a3958 fix - Employee Transfer, Promotion (#14603) 2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d Pro-rata component consistency for monthly Salary slip (#14595)
* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict
2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0 Update tax calculation (#14564)
* Tax Slab remove to_amt mandatory, condition data type Code

* Salary Slip - consider condition in tax slab

* Payroll Period - help text for tax slab condition
2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d HRA fix (#14589)
* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71 Employee Benefit (#14571)
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim

* Employee Benefit Application - Validate previous benefit claim

* Employee Benefit Claim - Code refactor

* Salary Slip - additional salary - fix
2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183 [Fix] Additional Salary Component and tax calculation (#14581)
* Additional salary not include in tax calculation

* Additional salary get doubled in salary slip via Payroll Entry - Fix

* Salary Component - if is_additional_component hide flexi
2018-06-20 10:52:20 +05:30
Shreya Shah
222c550c29 Parse left out time (#14586) 2018-06-20 10:51:32 +05:30
Shreya Shah
0cb0c0b642 [Tests] Staffing Plan (#14585)
* Add test case for Staffing Plan

* Fix codacy
2018-06-20 10:50:54 +05:30
Zarrar
42f2d1a7a8 fix incase no customer fetched (#14596) 2018-06-20 10:50:11 +05:30
Ranjith Kurungadam
f972e7b259 Staffing Plan - remove department filter, query by dates (#14590) 2018-06-20 10:48:40 +05:30
rohitwaghchaure
fd5ac45775 [Fix] Not able to make invoice in the subscription (#14594) 2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c Allowed paid amount against debit/credit note 2018-06-19 12:07:02 +05:30
Shreya Shah
b0575265fb Test case for Attendance Request (#14566)
* Add test case for Attendance Request

* Add a message if attendance not submitted

* Add test for cancelled document
2018-06-19 10:47:40 +05:30
Shreya Shah
97124e92fa [Fixes] Tax withholding category and Bank Guarantee (#14576)
* Fetch withheld percentage

* Set query for accounts on the basis of company

* Fix bank guarantee error on submit

* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Zarrar
ba1cdc6c57 fix opening invoice related authorization control - item=None (#14567) 2018-06-19 10:45:47 +05:30
Shreya Shah
cbff30f718 [Tests] Shift Planning (#14570)
* Cancel shift assignment on cancellation of shift request

* [minor] Fix shift type test

* Modify test for shift request

* Add test case for shift assignment

* Fix syntax

* Fix codacy
2018-06-19 10:45:33 +05:30
asbasawaraj
b0fafa9774 Additional fields in Certified Consultant DocType (#14573) 2018-06-19 10:43:55 +05:30
Shreya Shah
77de8dc102 Change Restaurant icon type to module (#14578) 2018-06-19 10:43:08 +05:30
Nabin Hait
875c941f3d fixes in setting itemised tax breakup 2018-06-18 17:41:27 +05:30
Nabin Hait
8eeb5694ba Fixed qty in item-wise sales history report 2018-06-18 17:41:27 +05:30
Nabin Hait
0bef91c241 minor fix in item type validation 2018-06-18 17:41:27 +05:30
Nabin Hait
ae02209b6a Removed autoname of child table 2018-06-18 17:41:27 +05:30
Shreya Shah
5c3929c5ea Fix positioning of fields (#14562) 2018-06-18 15:49:59 +05:30
Zarrar
e0adb6bbd6 cost_center overridden by company's default fix in SI (#14560) 2018-06-18 15:49:12 +05:30
Shreya Shah
1ac5585151 Bug - Add batch while creating serial nos (#14559) 2018-06-18 15:44:10 +05:30
Ranjith Kurungadam
5f7c7bfc78 remove patch to add hra fields (#14552) 2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
6cca03195f fix- Salary Structure filter (#14558) 2018-06-18 15:42:38 +05:30
Ranjith Kurungadam
28f49a5a8e fix - link validation error (#14547) 2018-06-18 10:40:23 +05:30
Zarrar
80ff296e97 data not filled in acc. receivable report for some field fix (#14546) 2018-06-17 11:21:10 +05:30
Manas Solanki
efa191c72e [minor fix] change the unicode/str to the datetime obejct (#14534) 2018-06-15 18:04:12 +05:30
rohitwaghchaure
83a2612a18 [Fix] Consolidated Financial Statement report (#14537) 2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535) 2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190 [minor] Fixes for Exchange rate revaluation doctype (#14533)
* Add set query for account and party_type

* Fix asset category error
2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4 Add test case for Inter company Journal Entry (#14531) 2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3 Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
Ameya Shenoy
40fe3a2cdf Merge branch 'hotfix' 2018-06-15 09:29:56 +00:00
Ameya Shenoy
ed77429496 bumped to version 10.1.38 2018-06-15 09:29:56 +00:00
Nabin Hait
380a74732c salary structure related test case fixes 2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511 create user permissions on save of employee 2018-06-15 13:16:44 +05:30
rohitwaghchaure
e647c1f3cb Renamed asset adjustment to asset value adjustment (#14532) 2018-06-15 13:06:28 +05:30
Nabin Hait
fcaeea70d2 Update employee.py 2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d Test case fixes 2018-06-15 11:59:58 +05:30
asbasawaraj
4c263480c9 Certfication Application Doctype and webform,Certfied Consultant DocType (#14528) 2018-06-15 10:04:19 +05:30
Ranjith Kurungadam
0e5c8283fa Salary Slip - update period factor for tax calc (#14527) 2018-06-15 10:03:57 +05:30
Nabin Hait
2737b08f0f blanket order related fixes 2018-06-14 18:07:34 +05:30
Shreya Shah
0b9b8d6826 Remove unused code (#14526) 2018-06-14 17:57:39 +05:30
Shreya Shah
02575d1f2c Merge pull request #14205 from Alchez/frappe-contract
[Feature] Managing Contracts in ERPNext
2018-06-14 17:57:02 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional (#14520)
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Manas Solanki
c7afbea708 Update bom.py (#14524) 2018-06-14 17:30:26 +05:30
Nabin Hait
d1f40ad0b6 minor fix 2018-06-14 17:09:55 +05:30
Shreya
cdd3982b44 [minor] Fix 2018-06-14 16:43:47 +05:30
Shreya
f333536446 Remove test_records.json and modify test 2018-06-14 16:43:07 +05:30
Nabin Hait
44341c1637 removed blanket order docs 2018-06-14 15:58:41 +05:30
Nabin Hait
b2d3c0f040 Update ordered qty in blanket order 2018-06-14 15:56:29 +05:30
Manas Solanki
9a31dd7062 test + documentation 2018-06-14 15:56:29 +05:30
Manas Solanki
2df1b31707 [minor] minor fixes along with the codacy 2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137 [feature] Blanket Order
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724 init the blanket order 2018-06-14 15:55:37 +05:30
Rushabh Mehta
1198d94904 [rename] Email Alert -> Notification 2018-06-14 13:18:21 +05:30
Shreya Shah
c3d1353ab5 Merge pull request #14518 from shreyashah115/patch-fix
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0 Check if table exists else return 2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b Merge pull request #14461 from mntechnique/sales_partner_type
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501)
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2 Merge pull request #14447 from zerodhatech/loan_application
[Enhancement] toggle required fields on select of repayment option in loan application
2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab [Fix] HR Fixes (#14511)
* Payroll Entry - fix in db query

* Salary Structure Assignment - Company read_only = 1

* Fixes in hr util and benefit claim

* Employee Benefit Application - Late application - fix
2018-06-14 11:55:17 +05:30
Zarrar
17089eeac3 [Minor] Fetching and appending items in Stock Reconciliation fix (#14509)
* minor fix in get_list of items in stock reconciliation

* reload doc fails because of backdated modified date

* item and item defaults should load prior to shopify refactor

* attribute value should't be none or empty, could be zero though

* Update item.py
2018-06-14 11:54:18 +05:30
Shreya Shah
dd8fba6783 Do not check for batch on cancellation (#14506) 2018-06-14 11:49:45 +05:30
Saurabh
8e74df09a4 [fix] On deletion of salary slip decrease the series count (#14508) 2018-06-14 11:47:21 +05:30
Rushabh Mehta
0d19744b17 [fix] for notification 2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES
62805e2101 Fix unicode literal issue that prevents payment entries to be created (#14515) 2018-06-14 09:14:07 +05:30
rohitwaghchaure
fb997d6539 [Fix] Woocommerce test cases (#14513) 2018-06-14 09:13:39 +05:30
Prateeksha Singh
0738483343 [docs] remove docs folder 💥, update docs app to foundation (#14516) 2018-06-14 09:11:05 +05:30
Manas Solanki
687c6bb002 Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption
[Fix] Travis for the test case test_material_consumption
2018-06-13 18:41:12 +05:30
Rohit Waghchaure
80d4477d1e [Fix] Travis for test_material_consumption 2018-06-13 18:37:03 +05:30
Shreya Shah
a2056a39bd Fix patch (#14503)
* Modify patch to move leave approvers from Employee master to Department master

* Rename child table names

- Rename leave approver to leave approvers
- Rename expense approver to expense approvers

* Import cstr

* Fix a condition
2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979 Update utils.py 2018-06-13 16:47:41 +05:30
Shreya Shah
3d73a6f7f2 Fetch details from Journal Entry in Accounts Payable report (#14495)
* Fetch bill_no, bill_date from Journal Entry

* Fix as per suggestion

* Fetch details only if bill_no exists
2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd
46c8ccc6a8 Fix conflict for taxable value having same item in GSTR-1 Report (#14492)
* Update gstr_1.py

Merge conflict for taxable value having same item

* Update gstr_1.py

* Minor Fix

* Update gstr_1.py
2018-06-13 15:34:17 +05:30
Jamsheer
30f37b2eb1 Payroll Entry - Separate JE for flexi salary component (#14502)
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry

* Journal Entry - validate cheque info on submit

* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5 Employee benefit application depends on lwp (#14494)
* Employee benefit - pro-rata amount - depends on lwp and working days

* HR Util - get holidays for employee

* Employee Benefit Application - calculate remainig on max benefit

* Employee benefit - late application - depends on lwp

* missing semicolon
2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84 [Fix] Travis for employee_tax_exemption_declaration (#14500) 2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f Remove docstatus=1 to show pending leaves as well (#14498) 2018-06-13 15:11:43 +05:30
Manas Solanki
9385cd5203 Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases
[Fix] Travis for stock entry
2018-06-13 14:06:20 +05:30
Rohit Waghchaure
0eef3f665d [Fix] Travis for stock entry 2018-06-13 13:06:25 +05:30
Manas Solanki
2304dc435a Merge pull request #14493 from manassolanki/travis-3
fix the timesheet test cases
2018-06-13 12:30:54 +05:30
Manas Solanki
b12f0d90af fix the timesheet 2018-06-13 12:30:02 +05:30
Jamsheer
f6d7b5d0c8 Salary slip - additional salary - deductions (#14476) 2018-06-13 11:36:43 +05:30
Tom Price
32c984cd3c Fix fields being hidden by default. (#14490)
Modify the title property to be sensible for general usage, unique and translatable.

Add allow_in_quick_entry properties appropriately.
2018-06-13 11:14:44 +05:30
Manas Solanki
176e7c5ce2 fix the test case for the payroll (#14480)
* fix the test case for the payroll

* fix the shopify and stock entry

* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Prateeksha Singh
5d0674a23a Merge pull request #14452 from pratu16x7/hotfix
[hotfix][enhance][tax-breakup] store itemized tax by item_name when possible
2018-06-12 17:42:01 +05:30
Prateeksha Singh
d1fffb6ba1 Merge pull request #14484 from pratu16x7/help-portal
[help-portal] don't show issues to guest
2018-06-12 17:40:36 +05:30
Prateeksha Singh
8d58429b69 [help-portal] don't show issues to guest 2018-06-12 17:39:12 +05:30
Nabin Hait
76c51b3068 minor ux fix 2018-06-12 16:29:10 +05:30
deepak-mnt
b95f60c6f3 minor changes 2018-06-12 16:04:49 +05:30
rohitwaghchaure
6c4fa1e917 Merge pull request #14478 from rohitwaghchaure/test_cases_fix_for_purchase_receipt
[Fix] Purchase receipt test cases
2018-06-12 13:55:02 +05:30
Rohit Waghchaure
b6381c66d8 [Fix] Purchase receipt test cases 2018-06-12 13:54:40 +05:30
rohitwaghchaure
a6b346f827 Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes
[Fix] Test cases for asset
2018-06-12 12:21:11 +05:30
Rohit Waghchaure
f270567c45 [Fix] Test cases for asset 2018-06-12 12:20:52 +05:30
Ranjith Kurungadam
138e6abaff Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428) 2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494 Check if user permission for employee exists (#14474)
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d Employee benefit - Late employee benefit application (#14465)
* HR Utils - get salary slip total benefit given for a payroll period

* Late employee benefit application

* Additional Salary - code refactor - get_amount

* new line in salary detail json

* Employee benefit late application - validation refactor

* Codacy fix
2018-06-12 11:30:59 +05:30
rohitwaghchaure
2354c1eba3 Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no
Code cleanup and fixes for the asset
2018-06-12 11:19:01 +05:30
Manas Solanki
65b55a53a6 Update test_leave_application.py 2018-06-12 11:18:01 +05:30
rohitwaghchaure
26943184e6 Merge pull request #14471 from rohitwaghchaure/fix_patch_update_total_qty_field
[Fix] patch
2018-06-12 01:16:52 +05:30
Rohit Waghchaure
ec2a2ac47e [Fix] patch 2018-06-12 01:16:28 +05:30
Manas Solanki
b81e384753 Merge pull request #14466 from frappe/manassolanki-patch-12
Only run the ERPNext tests
2018-06-11 19:30:01 +05:30
Manas Solanki
d7f6d45e28 Merge pull request #14468 from manassolanki/fix-travis-1
fix the salary slip test cases
2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d fix the salary slip test cases 2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158 Code cleanup and fixes for the asset 2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0 typo fixed 2018-06-11 18:26:45 +05:30
Manas Solanki
fde28a284e Update .travis.yml 2018-06-11 18:07:49 +05:30
Manas Solanki
e832aa4fe2 Merge pull request #14436 from shreyashah115/fix-trav
Travis again
2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c Patch for total quantity (#14458)
* Add path to patches.txt

* Modify patch
2018-06-11 17:32:17 +05:30
Jamsheer
0ca76323af Clinical Procedure Template - get_item_details - fix (#14449) 2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255 Merge pull request #14455 from frappe/kennethsequeira-patch-3
Fix minor div issue in Accounts index page
2018-06-11 16:33:51 +05:30
Prateeksha Singh
a831868d02 Merge pull request #14460 from chdecultot/hotfix_customer
Customer timeline data hotfix
2018-06-11 16:31:17 +05:30
rohitwaghchaure
7cd59a2089 Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 15:44:37 +05:30
Shreya
9680dc476f Remove commented code 2018-06-11 15:40:09 +05:30
Charles-Henri Decultot
943dc09f29 Customer timeline data hotfix 2018-06-11 09:42:05 +00:00
deepak-mnt
bb6753f206 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type 2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775 patch for sales partner type field 2018-06-11 14:53:25 +05:30
Manas Solanki
3bfe7b9148 Merge pull request #14454 from frappe/manassolanki-patch-11
Update cost_center.py
2018-06-11 14:25:50 +05:30
Manas Solanki
7e8cbf288c Update cost_center.py 2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af Fix minor div issue in Accounts 2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf [Fix] Alternative item, transferred qty issue for backflush method 2018-06-11 14:11:00 +05:30
rohitwaghchaure
b2fc349026 Merge pull request #14450 from rohitwaghchaure/removed_company_data_from_test_item_records
Removed company data from test item records
2018-06-11 13:35:14 +05:30
Rohit Waghchaure
cdec44ee81 Removed company data from test item records 2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75 [tax-breakup] store itemized tax by item_name when can 2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14 toggle required fields on select of repayment option in loan application 2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016 [Enhance] Standalone debit/credit note (#14269)
* [Enhance] Standalone debit/credit note

* Test cases

* Test cases and documentation

* Removed credit, debit note links from accounts module
2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663 Merge pull request #14363 from frappe/manassolanki-patch-10
PR to check the current state of Travis
2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5 minor fix in account and account utils (#14432) 2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b Fix Employee tax declaration test case 2018-06-11 10:31:40 +05:30
Shreya
664f30a018 Fix asset maintenance json 2018-06-11 10:31:40 +05:30
Shreya
77662eb5f4 Fix shopify test case 2018-06-11 10:31:40 +05:30
Shreya
294238abfd Fix shopify test case 2018-06-11 10:31:39 +05:30
Shreya
3b201cc2fd Remove python 3 stage from travis 2018-06-11 10:31:39 +05:30
Shreya
956277b121 Fix tests 2018-06-11 10:31:39 +05:30
Zarrar
65994210f6 fix patch to add email template in hr settings (#14427) 2018-06-08 16:57:06 +05:30
Zarrar
44175904c6 Tree fix (#14425)
* use frm.set_value instead of this.set_value

* generic methods moved to accounts/utils

* clean up code, and make use of methods added in utils
2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf Add patch to set update_field and update_value (#14421)
* Add patch to set update_field and update_value

- set update_field and update_value if empty
since expense claim workflow is dependent on it.

* Set update_field for workflow state of leave application

* Update patch entry

* Fix bug

* Update set_update_field_and_value_in_workflow_state.py
2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13 [Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367)
* Improve max crop period check and sort agriculture tasks chronologically

* Reformat crop cycle logic and add field to optimize task creation
2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a Add Employee Status Temporary Leave (#14423) 2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717 [Fix] Travis data (#14422) 2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419)
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Gaurav Naik
094617d29a Fix to allow migration of individual sites (#14413) 2018-06-08 11:44:27 +05:30
Shreya Shah
b9399d8781 Cancel attendance if leave application is cancelled (#14372)
* Cancel attendance if leave application is cancelled

* Fix as per review
2018-06-08 11:24:08 +05:30
Zarrar
8cd0f67b25 query fix if name contains apostrophe (#14370) 2018-06-07 16:48:31 +05:30
Zarrar
13f9851609 [Docs] Update doc for Supplier Group (#14373)
* add breadcrumb for Supplier Group tree

* change occurrences of supplier-type to supplier-group

* update supplier-group doc, update pngs
2018-06-07 16:47:30 +05:30
Zarrar
209d8f36f7 doctype was not reloaded to pickup changes (#14371) 2018-06-07 16:43:55 +05:30
Prateeksha Singh
50ae6b891b Merge pull request #14410 from pratu16x7/hub-fixes
Hub fixes
2018-06-07 14:19:01 +05:30
rohitwaghchaure
2704bef0b3 Merge pull request #14368 from shreyashah115/fix-trav
Some more travis fixes
2018-06-07 14:14:33 +05:30
Prateeksha Singh
00ab78d768 [hub] set page title dynamically 2018-06-07 14:13:00 +05:30
Shreya
88591314b0 Fix Leave Application test cases 2018-06-07 13:56:27 +05:30
Faris Ansari
25625f4092 Merge pull request #14408 from rohitwaghchaure/purchase_invoice_supplier_gstin_issue
[Fix] Code cleanup, if supplier gstin is none
2018-06-07 13:48:51 +05:30
Rohit Waghchaure
de82ad1c5f [Fix] Clenaup code if supplier gstin is none 2018-06-07 13:24:25 +05:30
Prateeksha Singh
9a7f957ace [hub] fix item page recursion 2018-06-07 12:40:40 +05:30
Shreya
88fe0d59d9 Fix daily work summary test 2018-06-07 11:22:26 +05:30
Shreya
4638d1ab97 Fix POS Profile test 2018-06-06 16:23:16 +05:30
Shreya
71316aaec8 Modify asset movement test cases and files 2018-06-06 15:55:30 +05:30
Saurabh
78a2d9785e add gudelines to report Security Vulnerabilities (#14364) 2018-06-06 15:08:20 +05:30
Zarrar
32a118d68c fix precision in stock entry (#14366) 2018-06-06 15:06:52 +05:30
Saurabh
eb579a11e1 Fix demo (#14365)
* fix demo

* Update asset.json
2018-06-06 15:05:31 +05:30
Shreya
90bdfed3db Modify all asset test cases 2018-06-06 14:27:55 +05:30
Manas Solanki
3504a2342e PR to check the current state of Travis 2018-06-06 12:46:06 +05:30
Ranjith Kurungadam
cff14793d8 Salary Structure, Slip - make fields readonly (#14358)
* Salary Structure, Slip - make fields readonly

* codacy fixes

* Salary Component - reorder fields, removed is_group for flexi

* Update salary_structure.js
2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8 Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Ameya Shenoy
a02d5d1104 Merge branch 'hotfix' 2018-06-06 05:41:37 +00:00
Ameya Shenoy
36cd433999 bumped to version 10.1.37 2018-06-06 05:41:37 +00:00
Charles-Henri Decultot
a774f3d7a0 POS closing voucher (#14270)
* POS closing voucher

* Codacy corrections + improvements

* Codacy corrections

* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Alchez
eb0ac37587 Fix ISO standard references in Agriculture (#14361) 2018-06-06 10:10:56 +05:30
Shreya Shah
59af3a0296 [Enhancement] UOM Conversion Factors (#13853)
* new doctype UOM category

* new doctype UOM Conversion Factor

* bootstrap json data for uom conversions

* uom conversion in item

* Patch to add all conversions and categories

* Fetch conversions multi-way

* fix codacy

* Rebase with develop

* [minor] Fix

* Add a test case

* Improvise as per review comment

* Add json data for UOMs

* Commonify function and call from patch

* Update uom_conversion_data.py
2018-06-06 09:44:46 +05:30
Sushant Nadkar
d458f7710f [UX Improvement] Removed uri encoding from search results on front end (#14266)
* removed uri encoding from search results on front end

* decode search string using html2text
2018-06-06 09:23:38 +05:30
Shreya Shah
c37fd050c5 Remove unnecessary variable (#14352)
* Remove unnecessary variable

* Replace cur_frm with frm

* Update material_request.js
2018-06-06 09:19:48 +05:30
Shreya
9aa7d8fe5f Update asset related test cases 2018-06-06 04:27:59 +05:30
Shreya
80a1e156cb Create location for asset test 2018-06-06 03:11:18 +05:30
Shreya
9c801b976d Fix share transfer test 2018-06-06 02:58:23 +05:30
Shreya
8f692f9a27 Fix batch test 2018-06-06 02:09:17 +05:30
Shreya
2ad81726d5 Fix utils.py 2018-06-06 02:09:17 +05:30
Manas Solanki
dabe21051c Update test_company.py (#14360) 2018-06-05 16:28:27 +05:30
Nabin Hait
1389030739 Merge branch 'mnaim-cloude8-develop' into develop 2018-06-05 14:41:07 +05:30
Nabin Hait
2f273e73b2 minor fixes 2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop 2018-06-05 14:21:57 +05:30
Shreya Shah
0cf4ee6bf2 Fix sentence structure (#14357) 2018-06-05 14:18:16 +05:30
Shreya Shah
6ff3a094e2 Fix currency exchange tests (#14356) 2018-06-05 14:16:10 +05:30
rohitwaghchaure
50d8c4a10f [Fix] Not able to save purchase invoice, due to invalid condition (#14355) 2018-06-05 13:08:10 +05:30
rohitwaghchaure
2da6b3d628 [enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296) 2018-06-05 13:06:52 +05:30
Shreya Shah
630721aacc Travis (#14354)
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
2018-06-05 12:56:10 +05:30
Nabin Hait
81d12cc9c8 Get default income account from Item 2018-06-05 12:49:03 +05:30
Ranjith Kurungadam
d580c92377 Staffing Plan (#14346)
* validate staffing plan

* staffing plan docs

* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set

* validate with parent and child company plans, plan now considers open job openings

* Failure details in validate error messages

* Fixed sql injection
2018-06-05 11:40:58 +05:30
Shreya Shah
4fa600a8dd Apply GST based on Origin and Place of supply GST Code (#14288)
* Add new gst field in Taxes and Charges template - is_inter_state

* Add a patch

* Add a regional function to fetch taxes on the basis of GSTin

* Add regional function to hooks.py

* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN

* Fixes in the setup.py for India region

* Set is_inter_state field

For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.

* Fix as per review comment
2018-06-05 11:27:53 +05:30
Shreya Shah
5103454642 New Report Address and Contacts (#14307)
* New Report Address and Contacts

* Fix codacy

* Add links to report in module pages
2018-06-05 10:44:36 +05:30
Sushant Nadkar
565bf203e5 [Improvement] Added display settings for item price, availibility and stock levels (#14308)
* display item price on website even when cart is disabled

* added display settings for item price, availibility and stock levels

* Update shopping_cart_settings.json
2018-06-05 10:43:11 +05:30
Alchez
31ab64822c Make the item UOM more visible (#14315) 2018-06-05 10:35:55 +05:30
Shreya Shah
f1e54836cb Remove hardcoded workflow patches (#14340) 2018-06-05 10:35:07 +05:30
Shreya Shah
b75e77a2cc Fix syntax (#14342) 2018-06-05 10:33:29 +05:30
Sushant Nadkar
64907e5083 Validate response message for frappe call (#14343) 2018-06-05 10:33:04 +05:30
Zarrar
7c088ff623 dont validate items if item_code not found (#14344)
item_code field is not set when created using invoice creation tool
2018-06-05 10:32:09 +05:30
rohitwaghchaure
7cf01e7c75 Replaced fixer api with exchangeratesapi (#14347) 2018-06-05 10:30:20 +05:30
asbasawaraj
1b16b772ab Report to Track Expiring Memberships - Monthwise (#14207) 2018-06-05 10:30:03 +05:30
Nabin Hait
c4eec99bc4 minor fix 2018-06-05 09:06:30 +05:30
Prateeksha Singh
03644f2a9d Merge pull request #14345 from pratu16x7/members-patch
[patch][update] naming_series field in member patch
2018-06-04 16:37:57 +05:30
Prateeksha Singh
2141bfab89 [patch][update] naming_series field in member patch 2018-06-04 16:36:12 +05:30
Rohan Bansal
841d54c49d Start adding tests for contracts 2018-06-04 15:56:38 +05:30
Rohan Bansal
bf0f0aaf6f Add Contract-related doctypes to ERPNext 2018-06-04 15:56:38 +05:30
Prateeksha Singh
37678d4838 [patch][new] rename old members as per naming series (#14339) 2018-06-04 14:25:51 +05:30
Sushant Nadkar
ebf76163ad show uom in list view of material request (#14338) 2018-06-04 14:23:25 +05:30
Ranjith Kurungadam
f576c570c9 Salary Slip - fix when no pyroll period found for tax calc (#14335) 2018-06-04 12:53:23 +05:30
Zarrar
fc03a0463c [Fix] Validate items for saleable, purchaseable or subcontractable in transactions (#14316)
* validate items to see if they are saleable

* check if items are subcontractable or saleable

* improvise name,error message and code
Validate type function validates item if they are of proper type for that transaction and throws descriptive error.
2018-06-04 12:52:52 +05:30
Nabin Hait
8c33587003 Merge branch 'ESS-LLP-dev_hra' into develop 2018-06-04 11:23:48 +05:30
Nabin Hait
8c7af497a0 Fixed merge conflict 2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2 Salary Slip - Deduct Tax (#14255)
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof

* fix - missing return statement
2018-06-04 11:17:55 +05:30
Nabin Hait
df7e0ed1e3 Merge branch 'ESS-LLP-jam_ent_emp_benefits' into develop 2018-06-04 11:15:13 +05:30
Nabin Hait
a55090dc88 Fixed merge conflict 2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d Rename - Additional Salary Component to Additional Salary (#14302)
* Rename Doctype Additional Salary Component to Additional Salary

* Remove unused import
2018-06-04 11:02:53 +05:30
rohitwaghchaure
5ecc26bf15 [Fix] get_shipping_address() takes at least 1 argument (0 given) (#14328) 2018-06-04 11:00:24 +05:30
Prateeksha Singh
8ac7dfee36 Merge pull request #14329 from pratu16x7/hub-fixes
[hub][minor] remove links #14309
2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863 [hub][minor] remove links #14309 2018-06-04 10:26:49 +05:30
rohitwaghchaure
c1cf495a93 [Fix] Special character issue (#14322) 2018-06-03 16:00:31 +05:30
Nabin Hait
953ea93f7b Update leave_type.json 2018-06-03 15:31:35 +05:30
Shreya Shah
d3255b1d3d Add docs for Inter Company Invoice creation (#14314) 2018-06-03 10:28:51 +05:30
Tropicalrambler
8b38e57af2 Correcting typo in the User Documentation (#14326)
This corrects a simple typo in the Pricing rule topic for documentation
2018-06-03 10:27:38 +05:30
Ranjith Kurungadam
375db6181d Earned Leave (#14143)
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this

* Earned Leave monthly scheduler method, test

* remove whitelist of method
2018-06-01 16:09:28 +05:30
rohitwaghchaure
ce642d73cb [Fix] Special character issue while upadting customer group in customer (#14312) 2018-06-01 15:11:21 +05:30
rohitwaghchaure
2fa057e4ad [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) 2018-06-01 15:10:55 +05:30
Zarrar
7e0e85912b item_name not fetched in packing slip (#14310) 2018-06-01 15:10:33 +05:30
Saurabh
f9f35d0b76 Merge pull request #14305 from saurabh6790/release_fix
typo fix
2018-05-31 18:11:53 +05:30
Saurabh
824e068d0a typo fix 2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
Saurabh
defecd3785 Merge branch 'hotfix' 2018-05-31 17:24:53 +05:30
Saurabh
fccf7f2a68 bumped to version 10.1.36 2018-05-31 17:54:53 +06:00
Ranjith
590bf4ce3a codacy fixes 2018-05-31 12:08:14 +05:30
Shreya Shah
c55f774fbf Address filter in gstr1 report (#14290) 2018-05-31 09:33:36 +05:30
AMS Fauzi
f3a6d95634 Develop: Batch Number Series (#14251) 2018-05-31 09:31:57 +05:30
rohitwaghchaure
780952ea03 Show actual qty in warehouse link search (#14258) 2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman
f12b446dc8 Bank Account #13714 PR (#14295) 2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495 [minor][fix] fix query syntax (#14294)
* [minor][fix] fix query syntax

* Update pos.py
2018-05-31 08:54:31 +05:30
Umair Sayed
5225c0e541 May docs (#14298)
* manual update

* Added new videos in learn section. Updated other help pages.

* project module rewrite

* employee and supplier master

* employee and supplier master fixes
2018-05-31 08:43:22 +05:30
Ameya Shenoy
cce7189b4f Added issue and PR Templates (#14300) 2018-05-31 08:42:52 +05:30
rohitwaghchaure
26833cf506 Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget
Rearrange fields
2018-05-31 00:27:45 +05:30
Rohit Waghchaure
7c0dd7a142 Rearrange fields 2018-05-31 00:27:05 +05:30
Ranjith
0cb2684130 Tax Exemption Proof Submission - validations, eligible hra calc 2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa Tax Exemption Declaration - update fields, move generic methods to utils 2018-05-30 20:50:48 +05:30
rohitwaghchaure
31a96d2a3f [Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287) 2018-05-30 18:13:47 +05:30
Prateeksha Singh
c62de0831e Merge pull request #14291 from pratu16x7/help-page
[fix] help page issue listing
2018-05-30 17:27:49 +05:30
Prateeksha Singh
66425c6e7f [fix] help page issue listing 2018-05-30 17:26:03 +05:30
Shreya Shah
47335e5e60 Stocking out items with expired batches (#14249)
* Add dropdown in Stock Entry to get expired batch items

* Fetch all the items with expired batches

* Add the fetched item details to stock entry details

* Modify as per the review comments
2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b [Enhance] Provision to set overproduction percentage for work order (#14248) 2018-05-30 15:28:09 +05:30
Prateeksha Singh
09e46a4e5f Hub fixes (#14281)
* [hub] remove list freeze

* [hub] fix svg in icon

* [hub] implement route options in hub list view
2018-05-30 15:12:20 +05:30
Jignesh Greycube
9aca025be2 Documentation to Fetch value in Child Table for a field (#14282)
* Fetch value in Child Table for a field

Sample Script to fetch value in child table

* Update fetch value in child table field
2018-05-30 15:08:55 +05:30
Ranjith
806cd93791 Merge remote-tracking branch 'frappe/develop' into dev_hra 2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e Merge pull request #14267 from surajshetty3416/workflow-doc-changes
Add doc related to workflow action
2018-05-30 12:34:21 +05:30
Zarrar
39c0add5a2 query fix sales-person-target-variance-item-group-wise (#14271) 2018-05-30 11:56:58 +05:30
Zarrar
58200182b4 update timeline data form Activity Log (#14276)
Documents updated are stored in Activity Log rather than Communication
2018-05-30 11:56:23 +05:30
Ameya Shenoy
c2c73ae96a [minor] removed vim swap file (#14277) 2018-05-30 11:55:38 +05:30
Prateeksha Singh
865e16621c [docs] fix embed issues (#14268) 2018-05-29 17:09:56 +05:30
Suraj Shetty
e51e51e138 Add requested changes 2018-05-29 16:46:19 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Suraj Shetty
77aed9d58b Move video section to bottom 2018-05-29 15:45:22 +05:30
Suraj Shetty
16d3494efc Add doc related to workflow action 2018-05-29 15:29:18 +05:30
Vladyslav Baidak
13d4391e70 Fixed SQL syntax error in Get Loan Details (#14265) 2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf Tax Exemption Declaration, Proof Submission HRA fields 2018-05-29 13:58:31 +05:30
Ranjith
fb257ba19c Company - Payroll Settings- fields 2018-05-29 13:57:27 +05:30
Nabin Hait
4d0c73a5c8 Submit auto created salary structure assignments 2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b [fix] add ignore validate flag (#14238) 2018-05-29 13:07:27 +05:30
Nabin Hait
288cbcafce Create demo data for salary structure 2018-05-29 11:04:11 +05:30
Nabin Hait
153536bf70 minor test fixes 2018-05-29 10:58:57 +05:30
Shreya Shah
ae95a8aa15 Update status in Purchase Receipt (#14257)
* Update status on submission if per_billed = 100

* Add patch to update existing records
2018-05-28 18:24:28 +05:30
Zarrar
b9f54ca946 [Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250)
* add doctypes allowed to group items, average the rate

* add check field to group items during print

* call common before_print in delivery note

* fix precision issue while calculating average
2018-05-28 17:41:09 +05:30
rohitwaghchaure
a8c6ec27c0 Merge pull request #14252 from rohitwaghchaure/leaderboard_translation_issue
[Fix] Translation issue in leaderboard
2018-05-28 15:51:00 +05:30
Saurabh
3c1b153cdb Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix
[fix] Stock Ledger report item filter
2018-05-28 15:23:21 +05:30
rohitwaghchaure
bd2989a541 Merge pull request #14254 from rohitwaghchaure/leave_application_issue_for_leave_approver
[Fix] Leave application, leave approver not fetching
2018-05-28 15:11:08 +05:30
Rohit Waghchaure
81302a8b12 [Fix] Leave application, leave approver not fetching 2018-05-28 15:10:19 +05:30
rohitwaghchaure
65684564c2 Merge pull request #14253 from rohitwaghchaure/financial_report_issue
[Fix] Data not displaying in financial reports
2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e Fixed data not displaying in financial reports 2018-05-28 15:01:57 +05:30
Rohit Waghchaure
06f91e2dc1 [Fix] Translation issue in leaderboard 2018-05-28 14:43:17 +05:30
rohitwaghchaure
30c88fe1a5 Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse
Fixed patch, checked warehouse available in the asset
2018-05-28 12:30:55 +05:30
Rohit Waghchaure
ad184f62e3 Fixed patch, checked warehouse available in the asset 2018-05-28 12:29:42 +05:30
Shreya Shah
13f39eb821 Display rate on the basis of stock UOM (#14246) 2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114)
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b Sales Payment Summart Report Improvement (#14243)
* fix iteritems() takes exactly 1 argument (2 given)

* adds new helper functions

* use new functions to make POS invoices filterable on warehouse and cost center

* more PEP8 fixes
2018-05-28 10:26:45 +05:30
Kenneth Sequeira
119cc5dec6 Documentation - Open Divs and Video Resolutions (#14242)
* fixed open div tag in edu docs

* fixed open div tag in projects page

* fixed open div for item variants, serialized inventory article

* fixed video aspect ratio and open div for Selling, Workflow, and Material Request
2018-05-28 10:24:43 +05:30
Ameya Shenoy
67c9566e77 Duct tape for demo (#14241)
The demo is just too old and needs a complete refactor. This is just a
workaroud to keep the demo working
2018-05-27 12:45:32 +05:30
Solufyin
64d02f917a [ADD] Department Analytics Bar Chart Feature (#14217) 2018-05-26 09:26:03 +05:30
rohitwaghchaure
a8fb2db001 [Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230) 2018-05-26 09:23:02 +05:30
Kenneth Sequeira
089a41c679 Fixed code in Embed Link (#14228) 2018-05-26 09:22:43 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232)
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493 Minor fixes (#14231)
* Parse date using getdate to avoid TypeError

* Fix alignment of application dashboard table text

* Use `user` instead of `email` to get value from user table
2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf Test case fixes (#14219)
* Test case fixes

* fetch_from fixes
2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c Remove unused imports 2018-05-25 15:20:50 +05:30
Manas Solanki
d09a6c9ccb Merge pull request #14225 from frappe/manassolanki-patch-8
Update employee.py
2018-05-25 14:47:49 +05:30
Rushabh Mehta
92bb786320 [fix] .travis.yml 2018-05-25 14:47:01 +05:30
Jamsheer
9416ac4ad4 Leave Priod - fix - grant leave allocation filter by grade 2018-05-25 14:46:31 +05:30
Manas Solanki
730cb3b547 Update employee.py 2018-05-25 14:46:21 +05:30
Jamsheer
fca88a6b22 Employee benefits - get_assigned_salary_structure 2018-05-25 14:35:02 +05:30
Jamsheer
79a6b42353 Salary Slip - options to fetch from migration 2018-05-25 12:56:22 +05:30
Jamsheer
ce89199abb taxable salary slabs remove from Salary Component and add to Payroll Period 2018-05-25 12:52:23 +05:30
Jamsheer
f1d10bf286 Salary Component - remove flexi_default 2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c Employee Benefit Claim - non pro-rata claim validation updated 2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d options to fetch from migration 2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a Employee Benefits in Salary Slip - Application and Claim 2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e get payroll period days - fix 2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0 Calculate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516 Validate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3 Employee Benefit Claim - date default to Today 2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec Max benefit amount in Employee Benefit Application Detail 2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02 Employee Benefit Calim - earning component filter updated 2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e Employee Benefit Application - refactor validation 2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f Salary Structure - validate flexi with max benefit 2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68 Payroll Period - validate dates and overlap 2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499 Payroll Period - fields refactor 2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21 Salary Structure - validate max benefits with flexi 2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e Salary Structure - filter for earnings 2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c Employee Benefit Application - earning component filter by salary structure flexi component 2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01 Salary Component - account mandatory for separate payment entry 2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752 Codacy fix 2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c Additional Salary Component - filter updated - salary_component 2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af Salary Component - fields - refactor fields behaviour 2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7 Employee Benefit Application - filter updated - earning component 2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb Employee Benefit Claim - filter for earning component 2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005 Employee Benefit Claim - Validation Updated - Code refactor 2018-05-25 12:37:35 +05:30
Nabin Hait
f87ec61043 Test case fixes for item defaults 2018-05-24 18:19:21 +05:30
Ranjith Kurungadam
27cf190269 healthcare fix - str encode to utf-8 (#14213) 2018-05-24 17:15:22 +05:30
Nabin Hait
b903fc4e71 Item defaults query fixes 2018-05-24 17:07:51 +05:30
Prateeksha Singh
05283b8af0 [fix] distribution page embed 2018-05-24 16:17:22 +05:30
Zarrar
ea064d4c5c module import fix in patch (#14203) 2018-05-24 15:54:48 +05:30
Achilles Rasquinha
2ec5b5ed8e bench init with preferred Python EXEC for CI (#13336)
* bench_init.sh added python executable flag for environment setup

* Added future python build matrix

* udpate build matrix

* Update .travis.yml

* Update .travis.yml
2018-05-24 15:16:12 +05:30
Ameya Shenoy
95e60927b4 Merge branch 'master' into develop 2018-05-24 08:45:14 +00:00
Ameya Shenoy
7ad556cd4c Merge branch 'hotfix' 2018-05-24 08:45:12 +00:00
Ameya Shenoy
475729cefe bumped to version 10.1.35 2018-05-24 08:45:12 +00:00
neckos
7663bb91c5 return list(filter()) not filter() (#14191)
filter constructs an iterator that is iterable only once
2018-05-23 19:45:34 +05:30
neckos
225af4a4cb unicode error in python3 (#14192) 2018-05-23 19:43:53 +05:30
Manas Solanki
f7713ebfa7 [optimize] introduce two filter in the report in order to handle large item master data (#14193) 2018-05-23 19:43:04 +05:30
Nabin Hait
5f861756a2 Item Default fixes 2018-05-23 19:37:06 +05:30
Nabin Hait
d5cb4c10a1 Set parent department if missing and not root itself 2018-05-23 18:36:18 +05:30
Rushabh Mehta
315dbd2ed1 [minor] chart_of_accounts.py for python3 2018-05-23 16:14:35 +05:30
Rushabh Mehta
f7414519bb [fix] set default supplier group in test 2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431 [fix] inconsistent indentation 2018-05-23 16:14:35 +05:30
Nabin Hait
46600406b8 Update rename_field_max_days_allowed.py 2018-05-23 13:12:24 +05:30
Achilles Rasquinha
efb731941d ran 2to3, evaluation (#13499)
* ran 2to3, evaluation

* Update update_gstin.py

* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121)
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1 Link Share Transfer to Account (#14127)
* Link Share Transfer to Account

* minor changes

* minoor changes
2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10 Project Budget does not filter per Project (#14179)
* Project Budget does not filter per Project

Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.

* Update budget.py
2018-05-23 10:47:53 +05:30
Prateeksha Singh
2f69254e56 [company][dashboard] implement heatmap with linked doctypes (#14185)
* [company][dashboard] implement heatmap with linked doctypes

* [company][dashboard] cache transaction history data, schedule query daily
2018-05-23 10:41:26 +05:30
Suraj Shetty
e03937fd6a Send daily work summary alert to only enabled users (#14175)
* Send daily work summary alert to only enabled users

* Fix import
2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274 Rename occurences of max_days_allowed to max_continuous allowed (#14180) 2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3 Merge pull request #14160 from shreyashah115/patches-fixes-travis
Fix patches for Travis
2018-05-22 15:26:49 +05:30
Faris Ansari
7a5221bd95 Add rename_field 2018-05-22 15:26:21 +05:30
Ameya Shenoy
1cc7500be9 Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Ameya Shenoy
92640cc899 Merge branch 'hotfix' 2018-05-22 09:06:38 +00:00
Ameya Shenoy
826f020862 bumped to version 10.1.34 2018-05-22 09:06:38 +00:00
Prateeksha Singh
b44ea4c8dc [website] Support Portal (#14144)
* [init] support portal

* [support-portal] Get started sections and forum activity

* [support-portal] integrate API search for forums, docs, etc

* [support-portal] integrate doctype docs search via global search

* [support-portal] /help page UI
2018-05-22 11:57:21 +05:30
rohitwaghchaure
24a169efb6 Merge pull request #14176 from rohitwaghchaure/inter_company_invoice_reference_issue
[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'
2018-05-22 11:56:33 +05:30
Rohit Waghchaure
7529bbb7b4 [Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference' 2018-05-22 11:55:48 +05:30
Zarrar
93a186aa11 fetch customer_gstin or billing_address_gstin optionally (#14075) 2018-05-22 09:16:42 +05:30
rohitwaghchaure
742d3e5549 [Fix] General ledger default_currency issue for member party type (#14172) 2018-05-22 09:10:01 +05:30
mnatalia
5f0e8d6e09 Added possibility to translate (#14173) 2018-05-22 09:08:50 +05:30
rohitwaghchaure
b1036e5582 Merge pull request #14171 from rohitwaghchaure/fixed_patch_v11_salary_structure_assignment
[Fix] Patch
2018-05-21 18:52:48 +05:30
Rohit Waghchaure
8e12a59d9b [Fix] Patch 2018-05-21 18:52:07 +05:30
rohitwaghchaure
3ec43966da Merge pull request #14170 from codingCoffee/sal
salary structure patch run if active employee
2018-05-21 18:39:10 +05:30
Ameya Shenoy
a7d402132f salary structure patch run if active employee 2018-05-21 18:38:18 +05:30
Prateeksha Singh
bcbe32ce7c Merge pull request #14169 from pratu16x7/hotfix
[hotfix][charts] update, without new build system
2018-05-21 18:31:39 +05:30
Prateeksha Singh
b434f2687e [charts] update, without new build system 2018-05-21 18:04:50 +05:30
Manas Solanki
6488d740c6 Merge pull request #14167 from frappe/manassolanki-patch-7
Remove the debugger from the material_request.js
2018-05-21 17:29:03 +05:30
Manas Solanki
a96421279d Remove the debugger from the material_request.js 2018-05-21 17:27:01 +05:30
rohitwaghchaure
734b874f3e Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
[Fix] Patch, default cost center, expense account for the item
2018-05-21 17:18:58 +05:30
Faris Ansari
d2b4ec5044 [fix] Set null values to '0' before changing column type 2018-05-21 16:55:31 +05:30
Zlash65
004bf218a0 remove changes for max_days_allowed patch 2018-05-21 16:52:08 +05:30
Rohit Waghchaure
0ca7ba3247 [Fix] Patch, default cost center, expense account for the item 2018-05-21 16:43:50 +05:30
Faris Ansari
e479057148 Merge pull request #14165 from codingCoffee/min
relieving_date wasnt of type datetime
2018-05-21 16:42:41 +05:30
Ameya Shenoy
35984daf72 relieving_date wasnt of type datetime 2018-05-21 16:37:27 +05:30
Manas Solanki
a752eca82c Merge pull request #14163 from manassolanki/fix-20
[fix] don't update the modified of item price while updating item
2018-05-21 16:37:01 +05:30
rohitwaghchaure
22619a8e0c Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue
[Fix] Unknown column 'i.stock_uom' in 'field list'
2018-05-21 16:22:23 +05:30
Rohit Waghchaure
abc6cf0aa5 [Fix] Unknown column 'i.stock_uom' in 'field list' 2018-05-21 16:18:37 +05:30
rohitwaghchaure
37da7d7d05 Merge pull request #14162 from rohitwaghchaure/permissions_issue_leave_application
[Fix] Permission issue while saving leave application
2018-05-21 16:02:58 +05:30
Manas Solanki
b5d9b38dee don't update the modified of the item price 2018-05-21 15:40:51 +05:30
Rohit Waghchaure
11e2a9ac90 [Fix] Permission issue while saving leave application 2018-05-21 15:39:38 +05:30
Faris Ansari
44528cb618 Merge pull request #14161 from Zlash65/travis-fix
[Minor] Department patch fix
2018-05-21 15:13:55 +05:30
Zlash65
41cb6cc491 patch fix - skip query if no when_then case 2018-05-21 15:10:06 +05:30
Shreya
70f9d07df8 Fix patches for Travis 2018-05-21 15:04:13 +05:30
Faris Ansari
6d2dfac44e [fix][patch] Shopify (#14159) 2018-05-21 14:41:11 +05:30
rohitwaghchaure
1275ea5123 Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver
Set leave approver in the leave application
2018-05-21 11:58:41 +05:30
Nabin Hait
19ce904030 Report added in Selling module 2018-05-21 11:07:04 +05:30
Nabin Hait
8d1f1765a9 Merge branch 'asbasawaraj-erpnext_issue_13818' into develop 2018-05-21 11:03:22 +05:30
Nabin Hait
2cfc247d88 customers without any sales transactions 2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818 2018-05-21 10:47:40 +05:30
Valmik
bfb8a73377 Append company after (#14119) 2018-05-21 10:44:35 +05:30
asbasawaraj
5f6b44e142 Formatted chapter member display (#14128) 2018-05-21 10:31:45 +05:30
Shridhar Patil
4c790488ea job opening designation made mandatory (#14153) 2018-05-21 10:30:17 +05:30
Valmik
c28378f448 [fix] get barcode string instead of dict (#14139)
* [fix] get barcode string instead of dict

* Update pos.py
2018-05-21 10:06:05 +05:30
Rohit Waghchaure
812224e56e Set leave approver in the leave application 2018-05-20 21:21:33 +05:30
Manas Solanki
f87762887a fetch defualt supplier from the item table (#14113) 2018-05-20 10:58:26 +05:30
Zarrar
42231df33a [Minor] Supplier Group test fix & default supplier in item fix (#14150)
* fix supplier group test

* item - default_supplier fix
2018-05-20 10:46:10 +05:30
Zarrar
1f3f18534b [Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149)
* move set_query to setup function

* rectify leave balance report according to deparmtent changes
2018-05-20 10:45:14 +05:30
Gaurav Naik
8f17281011 Initialized dynamic link on Warehouse (#14135)
* Initialized dynamic link for Warehouse

* Codacy Fixes
2018-05-20 10:39:14 +05:30
rohitwaghchaure
d08ac1fe79 Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11
Fixes in material request, asset maintenance
2018-05-18 16:39:48 +05:30
Rohit Waghchaure
73a99441ca Fixed get_query for default data in item 2018-05-18 16:39:08 +05:30
Rohit Waghchaure
6cdaa6e861 Fixes in material request, asset maintenance 2018-05-18 16:30:14 +05:30
Manas Solanki
d976c04b69 Merge pull request #14134 from manassolanki/fix-salary-patch
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8 [fix] patch for the salary structure assignment for old employees 2018-05-18 15:46:35 +05:30
rohitwaghchaure
7d834b946f Merge pull request #14117 from shreyashah115/fixes
Fix patch
2018-05-18 12:45:06 +05:30
rohitwaghchaure
f445298e7a Merge pull request #14132 from rohitwaghchaure/asset_finance_book_enhance
Changed condition of finance book in reports
2018-05-18 09:10:53 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
rohitwaghchaure
7d6cad2c67 Merge pull request #14130 from rohitwaghchaure/fixed_financial_report
Added finance book in Asset Depreciation Ledger report, fixed asset issue
2018-05-17 23:31:17 +05:30
Rohit Waghchaure
f689d01a0c Added finance book in Asset Depreciation Ledger report, fixed asset issue 2018-05-17 23:29:37 +05:30
Prateeksha Singh
8233cb11ed Merge pull request #14124 from pratu16x7/hotfix
[item-query] change order of description terms, name first
2018-05-17 17:32:54 +05:30
Prateeksha Singh
984a7a7e61 [item-query] change order of description terms, name first 2018-05-17 17:29:36 +05:30
rohitwaghchaure
b5cc946771 Merge pull request #14122 from shreyashah115/fixes
Fix in marking attendance from Leave Application
2018-05-17 17:16:57 +05:30
Shreya
65dd1f6b4c Mark attendance only if to_date <= nowdate in Leave Application 2018-05-17 17:13:56 +05:30
Basawaraj
6d334b8135 Added Report : Customers Without Any Sales Transactions 2018-05-17 16:54:03 +05:30
Shreya
362e0a9f6e Fix patch 2018-05-17 15:43:03 +05:30
Prateeksha Singh
7c9a6eba3f Merge pull request #14116 from rohitwaghchaure/project_heatmap_issue
[Fix] Heatmap issue in the project
2018-05-17 15:42:58 +05:30
Rohit Waghchaure
f2ccde0454 [Fix] Heatmap issue in the project 2018-05-17 15:40:32 +05:30
rohitwaghchaure
967d04ed0d Merge pull request #14096 from ESS-LLP/jam_enterprise_emp_benefit
Employee Benefit
2018-05-17 14:09:04 +05:30
rohitwaghchaure
8c6b7557db Merge branch 'develop' into jam_enterprise_emp_benefit 2018-05-17 14:08:06 +05:30
rohitwaghchaure
4444430200 Merge pull request #14108 from ESS-LLP/tax_deduction
Variable tax deduction
2018-05-17 13:55:52 +05:30
rohitwaghchaure
4c82ede9e1 Merge pull request #14112 from vjFaLk/item-uom
Add UOM to POS Item Template
2018-05-17 12:51:10 +05:30
Valmik Jangla
b52d5b21a1 Add UOM to Item View with Price 2018-05-17 00:09:21 -07:00
Faris Ansari
9e4889d756 [fix] Stock Ledger report item filter
- breaks when Item Code contains % symbol
2018-05-17 12:18:28 +05:30
rohitwaghchaure
d2f0d08234 Merge pull request #14105 from Zlash65/fix-dept
[Minor] Typo in Employee Transfer
2018-05-17 11:23:52 +05:30
rohitwaghchaure
509847a674 Merge pull request #14109 from rohitwaghchaure/asset_adjustment_fixes
[Fix] Asset adjustment issues
2018-05-17 11:23:26 +05:30
Rohit Waghchaure
992fb34c95 [Fix] Asset adjustment issues 2018-05-17 11:22:59 +05:30
Ranjith
fcfb5a3769 Merge remote-tracking branch 'frappe/develop' into develop 2018-05-17 10:07:23 +05:30
Ranjith
58363e6bbd get_payroll_period return name, fix hard coded leave period 2018-05-17 10:00:33 +05:30
Zlash65
e3f7e8b101 typo in frappe.throw in employee_transfer 2018-05-17 01:34:35 +05:30
rohitwaghchaure
de6ce587d0 Merge pull request #14104 from rohitwaghchaure/asset_wrong_account_linking_issue
Allow to select Asset Received But Not Billed in expense account head
2018-05-17 00:24:46 +05:30
Rohit Waghchaure
585945e65d Allow to select Asset Received But Not Billed in expense account head 2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33 Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty
[Fix] Validation issue
2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b [Fix] Validation issue 2018-05-16 23:57:28 +05:30
rohitwaghchaure
627c0a3acb Merge pull request #14102 from rohitwaghchaure/company_not_found_issue_v11
[Fix] Company mandatory issue
2018-05-16 23:32:33 +05:30
Rohit Waghchaure
44fda65b1d [Fix] Company mandatory issue 2018-05-16 23:31:09 +05:30
Ranjith
31eeff00f7 merge frappe/develop 2018-05-16 23:24:34 +05:30
rohitwaghchaure
39223e0341 Merge pull request #14100 from rohitwaghchaure/tds_issue
[Fix] TDS issue
2018-05-16 23:13:41 +05:30
Rohit Waghchaure
a91765707a [Fix] TDS issue 2018-05-16 23:13:02 +05:30
Ranjith
b485b1ef80 Salary Slip calc tax, except for flexi benefits 2018-05-16 23:01:40 +05:30
Ranjith
c6b2575a9c fields in salary detail, copy data from salary component on change 2018-05-16 22:59:21 +05:30
rohitwaghchaure
274f890246 Merge pull request #14099 from rohitwaghchaure/fixed_asset_date
Multiple fixes in asset
2018-05-16 22:13:15 +05:30
Rohit Waghchaure
e6acd4c57a Multiple fixes in asset 2018-05-16 22:12:39 +05:30
rohitwaghchaure
64e81b436e Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing
[Fix] Custom buttons not showing
2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422 [Fix] Cystom buttons not showing 2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0 Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue
[Fix] Gl Enrty issue
2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2 [Fix] Gl Enrty issue 2018-05-16 21:34:06 +05:30
rohitwaghchaure
513cd189f0 Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11
[Fix] onload set default employee, leave approver, company
2018-05-16 19:57:09 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
Jamsheer
8b86d18f73 Remove unused imports 2018-05-16 19:50:30 +05:30
Jamsheer
3434aabc28 Employee Benefit Claim in Salary Slip 2018-05-16 19:50:30 +05:30
Jamsheer
3abae9c1ba Employee Benefit Application - whitlist method get_max_benefits 2018-05-16 19:50:30 +05:30
Jamsheer
3e64297a3d Employee Benefit Application - validate maximun benefit 2018-05-16 19:50:30 +05:30
Jamsheer
3cd0ad4c98 Codacy fixes 2018-05-16 19:50:30 +05:30
Jamsheer
c9287b5b88 Manage grouping of salary component for flexible benefit 2018-05-16 19:50:30 +05:30
Jamsheer
6410022cab minor fixes 2018-05-16 19:49:39 +05:30
Jamsheer
c678d037e7 Salary slip - throw if no default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
5f6e274505 Salary slip - default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
43740a6511 Employee Benefit Application - employee benefit in salary slip 2018-05-16 19:49:39 +05:30
Jamsheer
0bc665c0a5 Salary Copmonent - Default flexible componnent 2018-05-16 19:49:39 +05:30
Jamsheer
15613e46ad Salary Copmonent - Defualt flexible componnent 2018-05-16 19:48:47 +05:30
Jamsheer
d63c39a514 Payroll Period - get payroll period days 2018-05-16 19:47:18 +05:30
Jamsheer
d66fb842c1 Employee Benefit Application - validate max benefit for employee 2018-05-16 19:47:18 +05:30
Jamsheer
2d6901d5dc Employee Benefit Application - validate max benefit amount for component 2018-05-16 19:47:18 +05:30
Jamsheer
9cb2fc2766 Employee Benefit Application - calcluate benefit amount 2018-05-16 19:47:18 +05:30
Jamsheer
d48998bae1 Employee Benefit Application - Calculate benefit amounts 2018-05-16 19:47:18 +05:30
Jamsheer
779f8ebbb3 Employee Benefit Application - get max benefit 2018-05-16 19:47:18 +05:30
Jamsheer
41616de9cc Employee Benefit Application - validate duplicate 2018-05-16 19:47:18 +05:30
Jamsheer
9cd292b187 Employee Benefit Application - filter updated 2018-05-16 19:47:18 +05:30
Jamsheer
4d93d339f7 Employee benefit - filters fro earning component 2018-05-16 19:47:18 +05:30
Ranjith
29e0ed3da1 Exemption Declaration - field total_amount 2018-05-16 19:10:35 +05:30
Manas Solanki
df0ffab16c Merge pull request #14093 from manassolanki/poc-fixes-1
[ui] more fields in the list view of assets
2018-05-16 18:25:37 +05:30
Manas Solanki
f3f1ba37b9 [ui] more fields in the list view of assets 2018-05-16 18:24:35 +05:30
rohitwaghchaure
4ea97c84ac Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b [Fix] Asset gl entry not creating for non perpetual 2018-05-16 18:20:52 +05:30
Manas Solanki
2684593af0 Merge pull request #14091 from manassolanki/poc-fixes-1
Added the travel request on the config page
2018-05-16 18:10:57 +05:30
Manas Solanki
5b34c00ba6 Added the travel request on the config page 2018-05-16 18:09:43 +05:30
Manas Solanki
fa57cdd86d Merge pull request #14090 from manassolanki/poc-fixes
create item default on making of invoice
2018-05-16 17:46:53 +05:30
Manas Solanki
5b93562ce3 create default on making of invoice 2018-05-16 17:44:51 +05:30
rohitwaghchaure
19a2260ce7 Merge pull request #14089 from shreyashah115/fixes
[Fix] General Ledger report filters error
2018-05-16 17:41:19 +05:30
Shreya
63d14cfac8 Instead of throwing error, just return 2018-05-16 17:30:58 +05:30
Shreya
df9516e906 Add Finance Book to route options 2018-05-16 17:30:35 +05:30
Manas Solanki
efae732370 Merge pull request #14088 from manassolanki/item-fixes
more fixes for the item defaults
2018-05-16 17:16:25 +05:30
Manas Solanki
e3bb1d0e3b more fixes for the item defaults 2018-05-16 17:14:59 +05:30
rohitwaghchaure
64076730a1 Merge pull request #14087 from manassolanki/item-fixes
return defaults according to the company
2018-05-16 17:02:32 +05:30
Manas Solanki
38667ab8da return defaults according to the company 2018-05-16 17:00:05 +05:30
rohitwaghchaure
adc5b128b6 Merge pull request #14086 from rohitwaghchaure/multiple_fixes
Multiple fixes
2018-05-16 16:42:25 +05:30
Rohit Waghchaure
b233e9d643 [Fix] Multiple fixes 2018-05-16 16:41:34 +05:30
Manas Solanki
028e2ad246 Merge pull request #14083 from frappe/codingCoffee-patch-3
spaces to tabs
2018-05-16 16:25:25 +05:30
rohitwaghchaure
de796266f2 Merge pull request #14084 from shreyashah115/fixes
[minor] Fix error
2018-05-16 16:21:14 +05:30
rohitwaghchaure
9c0a87e804 Merge pull request #14082 from manassolanki/item-fixes
[fixes] fix in the item defaults
2018-05-16 16:19:39 +05:30
Manas Solanki
e3910fb2a6 [fixes] fix in the item defaults 2018-05-16 16:16:34 +05:30
Shreya
fda15702bc Fix error 2018-05-16 16:14:34 +05:30
Ameya Shenoy
6e92958578 spaces to tabs 2018-05-16 16:11:20 +05:30
rohitwaghchaure
a7559be5b2 Merge pull request #14080 from rohitwaghchaure/po_pi_issue
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:42:53 +05:30
Rohit Waghchaure
23942701f1 [Fix] 'PurchaseInvoiceItem' object has no attribute 'company' 2018-05-16 15:41:00 +05:30
Manas Solanki
8e184569a1 Update item.json 2018-05-16 15:11:52 +05:30
rohitwaghchaure
9122f19e69 Merge pull request #14079 from saurabh6790/TDS_sprint
[fix] calculate withholding only on invoice
2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd [fix] calculate withholding only on invoice 2018-05-16 15:00:19 +05:30
Manas Solanki
b81ece9ddf Merge pull request #14076 from chdecultot/pricing_rule
Missing parentheses in price list rate determination
2018-05-16 14:55:32 +05:30
Manas Solanki
4534df36a9 Merge pull request #14078 from manassolanki/pos-fix
[enterprise] minor fixes
2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220 [enterprise] minor fixes
make the employee name mandatory in the employee onboarding
added the retention bonus amount
2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37 Merge pull request #14077 from manassolanki/travel-request
[rename] Photo ID -> Identification Document
2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd [rename] Photo ID -> Identification Document 2018-05-16 14:12:22 +05:30
Charles-Henri Decultot
2f822476dd Removal of debugging print 2018-05-16 08:40:16 +00:00
rohitwaghchaure
9ad0ac9557 Merge pull request #14068 from manassolanki/travel-request
[feature] added travel request doctype in HR
2018-05-16 14:05:26 +05:30
rohitwaghchaure
eff678d2d6 Merge pull request #13918 from manassolanki/item-level-defualts
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868 Missing parentheses in price list rate determination 2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
lasalesi
265005d30d apply sorting for make multiple variant attributes (#14073) 2018-05-16 13:10:25 +05:30
Ranjith Kurungadam
cdd4704485 Fixes, fields in Salary Component (#14071)
* remove duplicate fields

* Salary Component - fields is_tax_applicable, is_payable

* fix intendation
2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514 fix for tests 2018-05-16 13:05:13 +05:30
Manas Solanki
64614374d8 fix codacy 2018-05-16 13:00:56 +05:30
Manas Solanki
bbd8508783 optimize the patch 2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e changes for the default cost center 2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
Manas Solanki
c760222a6c add the item defaults in the childtable for multicompany 2018-05-16 12:44:06 +05:30
rohitwaghchaure
778841f399 Merge pull request #14072 from rohitwaghchaure/on_hold_issue
[Fix] 'Supplier' object has no attribute 'on_hold'
2018-05-16 12:26:33 +05:30
Rohit Waghchaure
909069fa20 [Fix] 'Supplier' object has no attribute 'on_hold' 2018-05-16 12:25:51 +05:30
rohitwaghchaure
b13a4480db Merge pull request #14070 from rohitwaghchaure/budget_validation_project_condition
Added project condition in budget validation
2018-05-16 12:19:31 +05:30
Ranjith
4bbf705e58 fix intendation 2018-05-16 12:17:57 +05:30
Ranjith
db120fb0bc Salary Component - fields is_tax_applicable, is_payable 2018-05-16 12:17:16 +05:30
Rohit Waghchaure
144e9b178a Added project condition in budget validation 2018-05-16 12:15:57 +05:30
Ranjith
447f0e495a remove duplicate fields 2018-05-16 12:13:46 +05:30
Rushabh Mehta
b56f3d0689 [fix] syntax errors 2018-05-16 12:03:39 +05:30
Saurabh
d60c0f2292 Refactor shopify (#13588)
* move shopify settings to ERPNext

* [fix] setup webhook for order and validate webhook request

* validate webhook request

* sync customer and item if not exists while syncing order from shopify

* pull item from shopify and minor fixes

* fix method naming, mechanisim to register and withdraw webhooks, patch

* minor fix

* minor fixes

* [Patch][fix] use remove_from_installed_apps instead of remove app

* log exceptions

* add shopify logging for failed requests

* minor fixes

* fix test case

* codecy fixes

* check shared secret exists

* Test Case fixes

* UX fixes and patch fixes

* Documentation

* fixes

* [fix] dump webhooks request data into doctype

* Provision to resync the order if error occured in sync

* [fix] set default host
2018-05-16 11:33:47 +05:30
tundebabzy
ad08d4ce96 Ability to hold payment for disputed invoices #12048 (#13298)
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments

* sanitize `on_hold` field input

* show hold status in list view

* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed

* reset release date if supplier is not on hold

* add validation to stop transactions when Supplier is blocked

* add test cases

* return empty list for outstanding references if supplier is blocked

* block make button:payment if supplier is blocked

* adjust test cases

* PEP 8 clean up

* more tests

* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold

* implement individual purchase invoice on hold logic

* allow user to change release date

* update manual

* final cleanup including more validation and tests

* update supplier manual

* make default for release_date argument todays date

* remove Auto Repeat added by mistake

* add on_hold_field to purchase invoice

* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view

* implement explicit payment hold in purchase invoice

* update manual

* add dialog for saving comment

* bug fix, refactor, clean up

* more test cases
2018-05-16 11:31:41 +05:30
Shreya Shah
4f40b2dca5 [Fix] Sales Person Reports (#13987)
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.

* Fix codacy

* Modify as per the review comment
2018-05-16 11:22:59 +05:30
Shreya Shah
1906cadd94 [Fix] Currency field in Pricing rule (#14004)
* some minor changes

* Set query for price list based on currency

* Validate Price list with currency
2018-05-16 11:20:30 +05:30
rohitwaghchaure
557f40465b Merge pull request #14067 from shreyashah115/fixes
[minor] Fix typo
2018-05-16 11:12:11 +05:30
rohitwaghchaure
e48b47fc0c Production Plan, do not consider the sales orders against which work order has been created (#13800)
* Production Plan, do not consider the sales orders against which work order has been created

* Added test cases
2018-05-16 11:07:55 +05:30
Shreya
2a1bcf285b [minor] Fix typo 2018-05-16 11:06:02 +05:30
Manas Solanki
d11b5d398d [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Doridel Cahanap
e42192bb6c [WIP] Alternative items (#13705)
* Alternative Items in BOM

* Alternative Items in Work Order
2018-05-16 10:58:39 +05:30
Jamsheer
0cde6ae3c5 Clinical procedure (#13540)
* Clinical Procesdure Template and Clinical Procedure Doctype

* Consultation - Create procedure and procedure prescription

* Patient Appointment - Create Procedure and Procedure appointment invoice

* Physician Schedule - Validate slot overlap

* Clinical Procedure Item - batch_no for Clinical Procedure not for Template

* Clinical Procedure - manage item batch_no

* Codacy - fixes

* Yet another Codacy and travic-ci fix

* Codacy - fixes

* Clinical Procedure - Codacy fix

* Permissions updated

* fixed Qty Indicators, Minor fixes

* Patient appointment for procedure prescription

* Doctype Patient Service Unit to Healthcare Service Unit

* Add healthcare service unit tree root

* Healthcare Service Unit - Tree view script

* Healthcare Service Unit - allow appointments check

* Clinical Procedure - remove unused variable

* Clinical Procedure - Get actual quantity from ledger - fix

* Clinical Procedure - apply transilation for message

* Warehouse in Healthcare Service Unit

* Service Unit in Clinical Procedure

* Codacy fix

* Missing semicolon
2018-05-16 10:54:00 +05:30
Rushabh Mehta
bc5c04f438 Update job_offer.js
cur_frm is deprecated
2018-05-16 10:51:15 +05:30
rohitwaghchaure
915877553a Merge pull request #14066 from rohitwaghchaure/minor_asset_fix
[Minor] Is fixed asset checkbox not set at server side if duplicate
2018-05-16 10:49:52 +05:30
Rohit Waghchaure
a02640e249 [Minor] Is fixed asset checkbox not set at server side if duplicate 2018-05-16 10:49:12 +05:30
Manas Solanki
1b48fde986 Make the communication from the issue webform (#14015) 2018-05-16 10:47:02 +05:30
Frappe PR Bot
b2a64d6344 [Translation] Updated Translations (#14021) 2018-05-16 10:46:11 +05:30
Charles-Henri Decultot
471dea0d10 Digest translation improvement (#14026) 2018-05-16 10:45:03 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
2018-05-16 10:44:38 +05:30
Rushabh Mehta
33db332eca Revert "apply sorting for make multiple variant attributes (#14060)" (#14065)
This reverts commit 257e18b640.
2018-05-16 10:43:58 +05:30
lasalesi
257e18b640 apply sorting for make multiple variant attributes (#14060) 2018-05-16 10:42:42 +05:30
Shreya Shah
11f3e8155b Import nowdate (#14064) 2018-05-16 10:42:09 +05:30
rohitwaghchaure
b749acf3fb Merge pull request #14063 from rohitwaghchaure/leaves_encashed_code_cleanup
[Fix] Issue, local variable 'leaves_encashed' referenced before assignment
2018-05-16 09:41:00 +05:30
Rohit Waghchaure
d3e84a6944 [Fix] Issue, local variable 'leaves_encashed' referenced before assignment 2018-05-16 09:39:44 +05:30
rohitwaghchaure
4671c53eb0 Merge pull request #14056 from ESS-LLP/retention_bonus
Retention bonus
2018-05-15 22:27:04 +05:30
rohitwaghchaure
29517c10af Merge pull request #14057 from ESS-LLP/enterprise_fix
Additional Salary Component - naming and date fix
2018-05-15 22:26:45 +05:30
rohitwaghchaure
41b457076d Merge branch 'develop' into enterprise_fix 2018-05-15 22:26:11 +05:30
rohitwaghchaure
043aae7293 Merge pull request #14058 from ESS-LLP/encashment
Leave Encashment
2018-05-15 22:24:52 +05:30
rohitwaghchaure
f9fa588ddc Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc [Enhance] Budget validation on material request, purchase order 2018-05-15 22:12:44 +05:30
Ranjith
d43e068a5b fix Leave Encashment unlink additional component, readonly encashed days 2018-05-15 20:11:30 +05:30
Ranjith
c60c6981a5 Merge remote-tracking branch 'frappe/develop' into encash 2018-05-15 20:00:26 +05:30
Jamsheer
3beeb7255f Compensatory Leave Request - add link to leave allocation 2018-05-15 19:42:27 +05:30
Jamsheer
ebb68afecb Leave Allocation - remove link to compensatory leave request 2018-05-15 19:41:25 +05:30
Jamsheer
a46ce11af9 Additional Salary Component - naming and date fix 2018-05-15 19:20:51 +05:30
Ranjith
819c3b1bf6 Retention Bonus - menu, validate 2018-05-15 19:17:31 +05:30
Ranjith
7d394c14ce Email Alert for Retention Bonus 2018-05-15 19:15:58 +05:30
Manas Solanki
120b393cf5 Merge pull request #14055 from frappe/manassolanki-patch-6
Update utils.py
2018-05-15 18:52:50 +05:30
Manas Solanki
70899f5a60 Update utils.py 2018-05-15 18:52:14 +05:30
anoop
bb629de49b doctype retention bonus 2018-05-15 18:41:46 +05:30
rohitwaghchaure
02f0bcdbd9 Merge pull request #14053 from Zlash65/fix-dept
[Minor] Remove unused module import
2018-05-15 18:29:13 +05:30
Zlash65
b8bd6644fd remove unused module import and error classes 2018-05-15 18:23:41 +05:30
anoop
504855e1a0 on submit: create additional salary component, revert on cancel 2018-05-15 18:11:49 +05:30
rohitwaghchaure
0e47837dab Merge pull request #14051 from shreyashah115/min-fix
[Fix] Supplier Doctype
2018-05-15 17:55:32 +05:30
rohitwaghchaure
c3b9eabe5e Merge pull request #14048 from shreyashah115/exchange-rate
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Shreya
acc4ceceb7 Add Patch to update existing records 2018-05-15 17:54:10 +05:30
Shreya
da5163da2f Fix Supplier Doctype 2018-05-15 17:43:50 +05:30
rohitwaghchaure
ec54cb1810 Merge pull request #14050 from Zlash65/fix-dept
[Minor] Account_type dropdown was hard coded in tree's quick entry
2018-05-15 17:39:37 +05:30
Zlash65
36cb8fb153 removed hard coded account_type from tree's add_child entry 2018-05-15 17:36:01 +05:30
Shreya
3f77852e93 Pass buying or selling as filter parameters
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Shreya
b547cdd8fa Add buying or selling to filters in get_exchange_rate 2018-05-15 16:58:45 +05:30
Ranjith
4c721cbe0f Leave Encashment - submit, cancel Additional Salary Component 2018-05-15 16:39:20 +05:30
rohitwaghchaure
c0b15cf41a Merge pull request #14041 from manassolanki/deferred-account
Deferred account
2018-05-15 16:31:05 +05:30
rohitwaghchaure
9a0aea8abc Merge pull request #14046 from shreyashah115/min-fix
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
rohitwaghchaure
9cf250ccba Merge pull request #14047 from rohitwaghchaure/enterprise_s_minor_changes
HR Fixes
2018-05-15 16:30:18 +05:30
Rohit Waghchaure
e0b515066e [Fix] Employee mandatory validation issue 2018-05-15 16:18:05 +05:30
Shreya
8e386167b8 Set Mandatory from client-side 2018-05-15 16:09:53 +05:30
Rohit Waghchaure
e2a7f86636 Navigation added for Employee Separation, Onboarding 2018-05-15 16:04:39 +05:30
Shreya
f636503dc1 [minor] Fix customer doctype 2018-05-15 15:57:27 +05:30
rohitwaghchaure
6bcf48a70e Merge pull request #14043 from Zlash65/fix-dept
[Minor] Remove duplicate from HR config file
2018-05-15 15:28:16 +05:30
rohitwaghchaure
66ece67d41 Merge pull request #14044 from shreyashah115/fix-promotion-doc
[Fix] Updation of new values in Employee Property History
2018-05-15 15:27:16 +05:30
Manas Solanki
2f4e5ee2c2 Update hooks.py 2018-05-15 15:25:14 +05:30
Zlash65
44146e0cda remove duplicates 2018-05-15 15:21:49 +05:30
Manas Solanki
1879f08c7c Merge branch 'develop' into deferred-account 2018-05-15 15:20:44 +05:30
Shreya
14069c9395 Fix updation of new values
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
2018-05-15 15:19:24 +05:30
Saurabh
ac2692711b Merge branch 'master' into develop 2018-05-15 14:59:38 +05:30
Saurabh
292f46fec0 Merge branch 'hotfix' 2018-05-15 14:59:36 +05:30
Saurabh
78a0be666f bumped to version 10.1.33 2018-05-15 15:29:36 +06:00
Saurabh
ce4f520908 Merge pull request #14042 from saurabh6790/patch_fix_15_05
[fix] if UOM and Warehouse link is invalid then set blank values
2018-05-15 14:58:12 +05:30
Saurabh
29160441bb [fix] if UOM and Warehouse link is invalid then set blank values 2018-05-15 14:56:18 +05:30
Manas Solanki
183dc731c2 Update employee_onboarding.py 2018-05-15 14:32:37 +05:30
rohitwaghchaure
6cf8a6c5f7 Merge pull request #14040 from Zlash65/fix-dept
[Minor] Department tree fixes
2018-05-15 14:05:15 +05:30
Zlash65
7f5ebbe494 call post company fixture after setting up company 2018-05-15 13:53:40 +05:30
Zlash65
667f846bdb bifurcate data into pre & post company fixtures 2018-05-15 13:53:40 +05:30
Zlash65
99e72af089 skip abbr, reload doc, disable edit for root department node' 2018-05-15 13:53:40 +05:30
Manas Solanki
0b7f64924d booking via the schedular 2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60 deferred account in the item and company master 2018-05-15 13:04:01 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Saurabh
1b18bba04a Merge branch 'hotfix' 2018-05-15 12:58:15 +05:30
Saurabh
f8c26bb778 bumped to version 10.1.32 2018-05-15 13:28:15 +06:00
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
rohitwaghchaure
686d5f219e Merge pull request #14039 from rohitwaghchaure/code_clanup_hr
Code cleaup
2018-05-15 12:47:33 +05:30
Rohit Waghchaure
4a126947f5 Code cleaup 2018-05-15 12:43:21 +05:30
anoop
6119b7337c updated get_leave_balance_on to consider encashed leaves by default. 2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f 13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending 2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b helper method to get employees assigned salary structure 2018-05-15 12:36:42 +05:30
anoop
161b3b2979 added field Total Leaves Encashed 2018-05-15 12:35:51 +05:30
anoop
067b5574ce duplicate field is_encash removed, fixed in install fixtures 2018-05-15 12:27:23 +05:30
Saurabh
ccd0617e19 Merge pull request #14017 from netchampfaris/apply-price-list-hotfix
[fix] apply price list
2018-05-15 11:25:08 +05:30
Saurabh
bf10d0f98b Merge pull request #14031 from shreyashah115/leave-balance
[Bug] Clear leave balance in Leave Application
2018-05-15 11:11:49 +05:30
Saurabh
12f708d155 Merge pull request #14035 from saurabh6790/v11_patch_fix
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 10:49:53 +05:30
rohitwaghchaure
ae41e5ffae Merge pull request #14036 from rohitwaghchaure/hcl_leave_application_issue
[Fix] Global name 'Approved' is not defined
2018-05-15 10:44:14 +05:30
Rohit Waghchaure
3f02820384 [Fix] Global name 'Approved' is not defined 2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45 [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
Shreya
dbb67fb4fd Clear leave balance on changing leave type 2018-05-14 23:02:09 +05:30
Saurabh
ff85c49330 Merge pull request #14030 from saurabh6790/field_fixes
remove duplicate fields occurred due to merge conflicts
2018-05-14 22:14:17 +05:30
Saurabh
99400bd958 remove duplicate fields occured due to merge conflicts 2018-05-14 22:11:17 +05:30
rohitwaghchaure
4f2e39cd09 Merge pull request #14028 from rohitwaghchaure/get_approved_leaves_for_period_issue
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:39:09 +05:30
Rohit Waghchaure
9ba72f7897 [Fix] get_approved_leaves_for_period module import failed 2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Saurabh
8b04d431c0 Merge pull request #13951 from ESS-LLP/jam_enterprise_sprint
Attendance Request, Leave Period, Compensatory Leave Request, Leave Policy
2018-05-14 20:57:55 +05:30
Saurabh
1f1dd96f57 Merge branch 'enterprise_sprint' into jam_enterprise_sprint 2018-05-14 20:57:40 +05:30
rohitwaghchaure
451bc04d4c Merge pull request #13982 from ESS-LLP/tax_exemption
Employee Tax Exemption Declaration, Proof Submission
2018-05-14 20:47:51 +05:30
rohitwaghchaure
3f0c735e53 Merge branch 'enterprise_sprint' into tax_exemption 2018-05-14 20:47:35 +05:30
rohitwaghchaure
2b8fc49205 Merge pull request #14027 from saurabh6790/TDS_sprint
Tds sprint
2018-05-14 20:43:33 +05:30
Saurabh
4ae089d6a1 Provision to deduct TDS on Advance 2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18 tds fixed for PI 2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec calculate TDS on Sales Invoice Amount 2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0 Supplier Tax Withholding Config 2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f Bootstrap 'TDS' via fixture 2018-05-14 20:41:38 +05:30
rohitwaghchaure
d9faba962b Merge pull request #13746 from Zlash65/supplier-group
[Enhance] Rename Supplier Type to Supplier Group - tree structure implemented
2018-05-14 20:40:30 +05:30
rohitwaghchaure
7c6bef4905 Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a Merge pull request #13984 from manassolanki/employee-boarding
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0 minor changes and fixed the conflicts 2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671 Merge pull request #14023 from mntechnique/accounting_period
Accounting Period
2018-05-14 20:33:09 +05:30
rohitwaghchaure
3282191aae Merge pull request #14025 from shreyashah115/html-table
Show pending leaves as an HTML table in leave application
2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
rohitwaghchaure
48199842aa Merge pull request #13750 from rohitwaghchaure/asset_purchase_link
Asset linked to purchase and serial no
2018-05-14 20:24:37 +05:30
rohitwaghchaure
8d626e6888 Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp
Additional Salary Component
2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11 Make Available Leave HTML Table 2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022 Fix - missing semicolon 2018-05-14 19:17:16 +05:30
Rohit Waghchaure
d644e6da16 Code cleanup 2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4 Patch to move asset fields to Asset Finance Book table 2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976 Patch to make location 2018-05-14 19:08:56 +05:30
Rohit Waghchaure
16bc853f6a Reschedule for future depreciations and booked difference amount in accumulated depreciation account 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
aa7b434270 Create asset adjustment doctype, post gl entry for the asset 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
0ea6fe4397 Added new doctype Finance Book Detail in asset, asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a Commonify get_asset_category_account and get_fixed_asset_account method 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191 Added default asset accounts in COA, CWIP account in asset category 2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba Treeview for Location 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418 Asset accounting 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4 Added account fields in the company, fixes in auto creation of the asset from PR 2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188 Asset linked to purchase receipt and serial no 2018-05-14 19:07:39 +05:30
Jamsheer
47039e801e Remove unused import 2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428 Remove unused variable 2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c Merge pull request #13808 from mntechnique/cost-center-number
Cost center number
2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd Attendance Request - half day check is enabled 2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf Merge pull request #13564 from sathishpy/develop
Bank Statement Import
2018-05-14 18:27:53 +05:30
rohitwaghchaure
3069943bce Merge pull request #13718 from Zlash65/enterprise
Department tree improv and moved Currency field up the list in Company
2018-05-14 18:26:37 +05:30
Gaurav Naik
21b2df41ac [Fix] len() instead of .length 2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a [WIP] Accounting Period Test cases 2018-05-14 18:11:09 +05:30
Jamsheer
ead858b4de Compensatory Leave Request - fix 2018-05-14 18:08:31 +05:30
Gaurav Naik
52571a80da Bootstrap documents for closing (js) 2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5 Bootstrap documents for closing 2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c [Fix] Indentation for accounting_period overlap 2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592 Compensatory Leave Request - leave allocation create and update - fix 2018-05-14 17:56:22 +05:30
Zlash65
06fd51bf69 patch fix for instructor 2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b create and update department records patch 2018-05-14 16:07:28 +05:30
Zlash65
03ad0f2f4a set query for department based on company 2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7 set department name with company abbr 2018-05-14 16:07:27 +05:30
Zlash65
39668609ce improv department tree 2018-05-14 16:07:27 +05:30
Zlash65
366ca92ba7 move default_currency on top 2018-05-14 16:07:27 +05:30
Zlash65
513f13df27 patch fix 2018-05-14 16:05:16 +05:30
rohitwaghchaure
c7ccd3ca2e Merge pull request #13985 from saurabh6790/leave_period_fix
add get leave period method
2018-05-14 15:47:15 +05:30
Faris Ansari
404f39d373 [fix] apply price list
in_apply_price_list flag remains true if server exception occurs
2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe codacy fix 2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4 [Enhancement] Monthly Attendance Report (#13970)
* Update Attendance on Approval of Leave

* Separate out leaves on the basis of its type

* Remove commented code

* Make attendance records if not found

* Fix Codacy

* Replace bad code in attendance.py
2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5 [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc button triggers not working in tasks table (#13973) 2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10 [fix] Incorrect currency conversion in Itemised Tax Breakup (#14006) 2018-05-14 14:19:31 +05:30
Suraj Shetty
f93cc57e8a Ignore user permission for 'variant Of' in Item (#14013)
- Since mostly variant of is null it gets filtered out if
user permission is applied.
And since variant is a link to item itself there is no need to check
user permission for it as user permission gets applied on Item anyways.
2018-05-14 14:07:20 +05:30
Shreya Shah
ba6cb8ae4b [Healthcare] Fix UI (#14011)
* Fix UI

* Fix Calendar View
2018-05-14 14:06:31 +05:30
Faris Ansari
a7387b45ec [fix] Get items from BOM error in python 3 (#14012) 2018-05-14 14:05:52 +05:30
rohitwaghchaure
7f63c1ad7c Merge pull request #14014 from rohitwaghchaure/hotfix_production_order_name_issue
[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'
2018-05-14 14:04:09 +05:30
Jamsheer
236be22648 Payroll entry - get employee fix 2018-05-14 13:32:50 +05:30
Rohit Waghchaure
ebe1ebead2 [Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations' 2018-05-14 13:21:45 +05:30
Jamsheer
d0b0c87f40 get additional salary component in salary slip 2018-05-14 12:16:46 +05:30
Jamsheer
08b60a1a62 New Doctype - Additional Salary Component 2018-05-14 12:16:46 +05:30
Jamsheer
a5028c8e54 Salary Structure - filter updated, Salary Component - fields re-arranged 2018-05-14 12:16:45 +05:30
Jamsheer
b5c5c471b4 Formula on Salary Component Master 2018-05-14 12:16:45 +05:30
Jamsheer
4bd7cdb018 Salary Structure Assignment - filters applied 2018-05-14 12:13:47 +05:30
Manas Solanki
a27d29b349 enable deferred revenue in the item master 2018-05-14 12:07:14 +05:30
Zlash65
f665189ab3 tree based changes 2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7 added fixtures for supplier-group, changed analytics report accordingly 2018-05-14 11:45:38 +05:30
Zlash65
c88ce364ce treeview implemented for supplier group 2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635 patch to reload_doc and rename field 2018-05-14 11:45:38 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Zlash65
890707854d config/utility level changes 2018-05-14 11:45:38 +05:30
Zlash65
0a50554417 doctype level changes 2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18 json level changes 2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed rename supplier-type to supplier-group 2018-05-14 11:42:30 +05:30
rohitwaghchaure
a8c49f26d3 Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue
Fixed spelling
2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe Fixed spelling 2018-05-13 16:17:18 +05:30
Saurabh
c1acbdfb69 [fix] overlapping dates 2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610 add get leave period method 2018-05-12 17:45:39 +05:30
Faris Ansari
f2b3307136 Remove escaped customer string (#13986)
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
2018-05-11 21:07:27 +05:30
Jamsheer
46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967)
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
2018-05-11 21:05:24 +05:30
Pawan Mehta
c53e35368d Shift Management - Documentation and Tests (#13997)
* [fix] #13996

* codacy fix
2018-05-11 21:03:50 +05:30
Gaurav Naik
9502476c67 Accounting Period overlap validation 2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226 Accounting Period autoname 2018-05-11 07:52:50 +05:30
Ranjith
ded636097e Tax Declaration, Proof Submission tests 2018-05-10 15:42:04 +05:30
Ranjith
5a8e6427f4 Tax Declaration, Proof Submission, validation 2018-05-10 15:06:49 +05:30
Ranjith
85d2d571c5 update hr menu, field subcategory in child table 2018-05-10 15:04:32 +05:30
Ranjith
e1c556b7e0 Doctype Employee Tax Exemption Sub Category 2018-05-10 15:02:57 +05:30
Ranjith
96121c598e Tax Declaration, Proof Submission, field company 2018-05-10 15:02:00 +05:30
rohitwaghchaure
fdb7156c0b Merge pull request #13979 from KanchanChauhan/driver-filter
[Minor] Show only active driver in Delivery Trip
2018-05-10 12:36:42 +05:30
Kanchan Chauhan
d560da950d [Minor] Show only active driver in Delivery Trip 2018-05-10 10:42:56 +05:30
Jamsheer
9032c9d91d Documentation - updated 2018-05-09 19:19:34 +05:30
Nabin Hait
9d215c2d9b Set operations on production order while making from Material Request 2018-05-09 18:32:54 +05:30
Nabin Hait
56f0328bed Merge branch 'finance-book' into enterprise_sprint 2018-05-09 15:10:52 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f Added finance book filtering logic to financial_statements.py 2018-05-09 15:03:40 +05:30
Gaurav Naik
8cbbdfdf30 Added finance book filter to financial_statements.js 2018-05-09 15:03:05 +05:30
Gaurav Naik
40559d5f5c Added finance book filter logic to ReceivablePayable 2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51 Added finance book filter in accounts_receivable.js 2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f Added finance book filter in accounts_payable.js 2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c Added finance book filter logic in general_ledger.py 2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d Added finance book filter to General Ledger 2018-05-09 14:57:36 +05:30
Gaurav Naik
a6d3cbfbc5 Added finance book field to GL Entry doctype 2018-05-09 14:56:52 +05:30
Gaurav Naik
30f9e0f547 Set finance book in make_gl_entries 2018-05-09 14:56:39 +05:30
Gaurav Naik
a948726ddd Added Finance Book doctype 2018-05-09 14:53:51 +05:30
Manas Solanki
fbe548e4be [Enterprise] Bank Guarantee Enhancements (#13960) 2018-05-09 14:49:53 +05:30
Vishal Dhayagude
3cf0d51e65 [fix] Compounding error in task weight (#13958)
* [fix] Compounding error in task weight

* [minor] minor changes

* [fix] Requested Changes added
2018-05-09 10:42:39 +05:30
Jamsheer
63a8f83076 Leaves - Documentation 2018-05-08 18:45:41 +05:30
Nabin Hait
2b16712c83 Merge branch 'ESS-LLP-staffing' into enterprise_sprint 2018-05-08 18:36:53 +05:30
Nabin Hait
3881e98000 Staffing plan for group company 2018-05-08 18:36:14 +05:30
Jamsheer
4573e6609f Leave Type - remove field is_parental_leave 2018-05-08 18:33:49 +05:30
Nabin Hait
b2800eeb2a Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-05-08 16:34:35 +05:30
Nabin Hait
9036b9ee85 Merge branch 'master' into develop 2018-05-08 16:31:42 +05:30
Nabin Hait
9fc5ddc26e Merge branch 'hotfix' 2018-05-08 16:31:38 +05:30
Nabin Hait
0ff31f0ebf bumped to version 10.1.31 2018-05-08 17:01:38 +06:00
Nabin Hait
247bd94824 Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing 2018-05-08 16:30:18 +05:30
Zarrar
f2df7f32fa update subscription to auto_repeat across dashboards (#13956) 2018-05-08 16:06:36 +05:30
Nabin Hait
3e47fbb2f0 assign salary structure custom button 2018-05-08 16:05:04 +05:30
Saurabh
40349f4b00 [fix] add stock entry link on Material Request Dashboard (#13950) 2018-05-08 15:23:51 +05:30
Saurabh
b36517158b [fix] cheque print template coordinates (#13959) 2018-05-08 15:23:29 +05:30
Jamsheer
bec950428c HR Utils - Trailing whitespace 2018-05-08 12:50:14 +05:30
Manas Solanki
3b9720f0be Merge pull request #13952 from manassolanki/minor-report-fix
[minor] fix for the student report card
2018-05-08 12:43:43 +05:30
Manas Solanki
cf26b2ca1c [minor] fix for the student report card 2018-05-08 12:39:02 +05:30
Jamsheer
fe882bc68a Leave Application - Test - Leave allowed, applicable after, maximum continuos days 2018-05-08 12:36:51 +05:30
Jamsheer
3153734e7e Leave Application - validate applicable after for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
62a93533fc Leave Policy - Validate Annual alloction for leave type 2018-05-08 12:36:51 +05:30
Jamsheer
d7bfa2303f Leave allocation - validate max leave allocation days for a leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b42f3d41ab Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type 2018-05-08 12:36:51 +05:30
Jamsheer
b408b158dd Leave allocation - link to leave period and compensatory leave request 2018-05-08 12:35:40 +05:30
Jamsheer
8c4386f016 Leave Type - new field is_compensatory 2018-05-08 12:35:40 +05:30
Jamsheer
c7aaf0ba67 Leave Period - Validate and Create Leave Allocation 2018-05-08 12:35:40 +05:30
Jamsheer
0e2cc5574d HR Util methods 2018-05-08 12:35:40 +05:30
Jamsheer
9d857579af Attendance Request - validate and create attendance 2018-05-08 12:35:40 +05:30
Jamsheer
b41baa228c Attendance Request - link to company 2018-05-08 12:35:40 +05:30
Jamsheer
a9c82b6464 Attendance - link to attendance request 2018-05-08 12:35:40 +05:30
Shreya Shah
204c3bc37e Remove Production Planning Tool docs (#13946)
* Remove Production Planning Tool docs

* Remove Offer Letter Occurrences

* Rename Employee Loan Occurrences
2018-05-07 18:21:03 +05:30
bghayad
1184a7300a Adding Payments View for Fees (#13939)
* Adding View Payments For Fees

* Adding View Payments For Fees

* Adding Payments View For Fees
2018-05-07 18:20:37 +05:30
Nabin Hait
b7613af73c Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint 2018-05-07 16:13:33 +05:30
Nabin Hait
be10cfed92 Merge branch 'shreyashah115-multi-company-transations' into enterprise_sprint 2018-05-07 16:12:23 +05:30
Nabin Hait
330fae8652 minor fixes 2018-05-07 16:11:35 +05:30
Shreya Shah
7bd83f3d8e Rename occurrences for Production Order to Work Order (#13944) 2018-05-07 15:27:21 +05:30
Ranjith
c36578e8d3 Job Opening - display vacancies only on staffing plan 2018-05-07 14:19:40 +05:30
Ranjith
f220e89d9f Job Opening - get planned opening, validate vacancies by Staffing Plan 2018-05-07 13:58:54 +05:30
Ranjith
e4cda0380a Staffing Plan - validations, get employee count on designation change, calc estimated cost 2018-05-07 13:54:49 +05:30
Nabin Hait
fdc67a577f Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations 2018-05-07 13:12:16 +05:30
Ranjith Kurungadam
95c5c055f8 Optional leave (#13931)
* Optional Holiday - move holiday list from leave type to leave period

* Optional Leave - validate on Leave Application

* test Optional Leaves
2018-05-07 12:43:08 +05:30
Nabin Hait
420c140c48 Merge branch 'ESS-LLP-employee_promotion_transfer' into enterprise_sprint 2018-05-07 12:23:22 +05:30
Nabin Hait
d5220c0ff4 minor fix 2018-05-07 12:22:57 +05:30
Nabin Hait
01f5df72cc Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer 2018-05-07 11:55:52 +05:30
Rah Yuliantoro
b3882cacd9 update coa and company default (#13937)
* Update standard_chart_of_accounts.py

adding account for employee advances

* Update standard_chart_of_accounts_with_account_number.py

adding account for employee advances

* Update company.py

adding accounts for default fields in company doctypes

* Update company.py

Missing some default accounts for fields in company doctype
2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904 Exchange rate revaluation (#13932)
* Added account data on child table

* Added Journal Entry button and functionality

* Add docs

* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Ranjith
86b81e99e5 codacy fixes 2018-05-05 16:49:51 +05:30
Nabin Hait
338e1b6e91 Merge branch 'master' into develop 2018-05-05 14:33:35 +05:30
Nabin Hait
02a40e9d7b Merge branch 'hotfix' 2018-05-05 14:33:33 +05:30
Nabin Hait
ea199f9cd9 bumped to version 10.1.30 2018-05-05 15:03:33 +06:00
Ranjith
9505ea93cf codacy fixes 2018-05-05 14:32:42 +05:30
Nabin Hait
161f35a687 Update sales_invoice.py 2018-05-05 14:32:31 +05:30
Ranjith
715780b78b Employee Promotion, Transfer - documentation 2018-05-05 13:51:34 +05:30
Ranjith
a68a108234 Employee Promotion, Transfer - test submit before date, create new employee 2018-05-05 13:43:15 +05:30
Ranjith
56b58017d1 Employee Promotion, Transfer - validate, submit, cancel workflow 2018-05-05 13:41:48 +05:30
Ranjith
fddfffd3e6 Employee Promotion, Transfer - modal to add details to child table 2018-05-05 13:27:26 +05:30
Ranjith
ea60225760 Employee Promotion, Transfer - update child table, added fields 2018-05-05 13:25:46 +05:30
Nabin Hait
4bbe5fbefc Fixes related to auto repeat 2018-05-05 12:32:59 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Nabin Hait
fcb984b294 Merge branch 'hotfix' 2018-05-05 12:13:29 +05:30
Nabin Hait
723fe8fb1b bumped to version 10.1.29 2018-05-05 12:43:29 +06:00
mnaim-cloude8
c3b4464df8 Remove unnecessary field. 2018-05-04 22:06:35 +08:00
Ameya Shenoy
47c0c8ba49 removed bad code and made compatible with pip 10 (#13805) 2018-05-04 19:20:20 +05:30
Rohit Waghchaure
3e0a937cb8 [Fix] Tax not changes when user change the POS profile in the sales invoice 2018-05-04 19:20:20 +05:30
Shreya Shah
88aa3ec275 [Report] HSN-wise-summary of outward supplies (#13803)
* hsn wise summary report

* renamed

* added total amount column

* moved total amount column
2018-05-04 18:33:14 +05:30
Jamsheer
bd63f0056a Patient medical record updation and deletion fixes (#13891) 2018-05-04 18:13:28 +05:30
Pawan Mehta
5e7b2eb338 Add Calendar View to Attendance doctype (#13919)
* [fix] #13917

* codacy fixes

* remove company

* add status

* fix date issue

* code optimizations

* change sql
2018-05-04 18:12:35 +05:30
creador30
dae8f1b353 Search for item_code (#13912)
Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.
2018-05-04 18:12:03 +05:30
Shreya Shah
55daa9cd24 fix taxable amount for same items (#13927) 2018-05-04 18:01:23 +05:30
Shreya Shah
764b9bfeba cint for Item field has_variants (#13916)
* convert none type value to int

* Fix typo
2018-05-04 17:58:36 +05:30
Suraj Shetty
dcc90e3312 Add fix to support changes in user permission (#13923)
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
Shreya Shah
eec0209e3c Fetch mandatory reqd from server side (#13924) 2018-05-04 17:51:10 +05:30
Nabin Hait
62b985d405 [fix] Update show_in_website in template 2018-05-04 12:21:15 +05:30
KanchanChauhan
f4feedace4 Allow changing of Address after Submit (#13747) 2018-05-03 19:08:54 +05:30
Suraj Shetty
57fbebb630 Update user permission doc (#13695) 2018-05-03 19:07:07 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666)
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Shreya Shah
ecb9315ea1 Inter Company Journal Entry (#13683)
* rebase with enterprise_sprint

* Add Inter company account checkbox in Account master

* Add Inter Company Journal Entry Voucher Type in Journal Entry

* Make Inter Company Journal Entry button

* Dialog to select company for Inter Company Journal Entry

* Map relevant fields in the Inter Company Journal Entry and reference links

* Rebase

* Add Documentation
2018-05-03 19:04:36 +05:30
Zarrar
6f3594b2e4 [Enhance] GL Entry - ability to multiselect party (#13769)
* change dynamic link to multiselect field and improv

* print based fix

* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
rohitwaghchaure
1aa3a11546 On auto-creation of new Fiscal Year, send Email notification to the account users (#13789) 2018-05-03 18:59:26 +05:30
Saurabh
ed393d1025 [fix] consider user permissions in leave application calendar view (#13902)
* [fix] consider user permissions in leave application calendar view

* add hr settings to control leave calendar view

* add patch
2018-05-03 18:52:25 +05:30
Nabin Hait
ed376cacc8 Set Qty in transactions based on serial no via Stock Settings (#13897) 2018-05-03 16:24:52 +05:30
rohitwaghchaure
125c0caf12 Added brand in item price doctype, item prices report (#13900) 2018-05-03 16:23:57 +05:30
Shreya Shah
c4323cb6ba remove set query (#13908) 2018-05-03 16:19:56 +05:30
Shreya Shah
c10820e93e fix error (#13907) 2018-05-03 16:09:34 +05:30
mnaim-cloude8
e21ad0e641 Add printing details section for Job Offer. To fetch correct letter head for company selected at Job Offer. 2018-05-03 15:43:25 +08:00
Saurabh
7461806b1c Merge pull request #13892 from codingCoffee/travis
dark magic to revive travis
2018-05-02 23:23:07 +05:30
Ameya Shenoy
bb7c5ac0f8 dark magic to revive travis
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
2018-05-02 17:32:39 +05:30
Prateeksha Singh
a7c6ff8f3e Merge pull request #13837 from shreyashah115/serial-batch-linking
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Saurabh
0272fc05bf Merge branch 'hotfix' 2018-05-02 14:48:09 +05:30
Saurabh
4f6b68fef2 bumped to version 10.1.28 2018-05-02 15:18:09 +06:00
Shreya
27e4e244b6 fix codacy 2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d changes as per the reviews 2018-05-02 14:34:14 +05:30
Shreya
b47302dd52 unlink reference on cancellation of any invoice 2018-05-02 14:34:14 +05:30
Shreya
c804f424ab update reference fields on both invoices 2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd validations to check price list and currencies 2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7 mapping of relevant fields 2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03 validations before routing to invoice 2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e Inter company invoice reference link field 2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe make inter company invoice button on Invoices 2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e Allowed To Transact With child table in Customer & Supplier 2018-05-02 14:34:14 +05:30
Shreya
59512aaaaa Internal Supplier check in Supplier 2018-05-02 14:34:14 +05:30
Shreya
7946ca216e Internal Customer check in Customer 2018-05-02 14:34:14 +05:30
Nabin Hait
d2861df939 Renamed Health Insurance to Employee Health Insurance 2018-05-02 14:34:14 +05:30
Nabin Hait
43274de5df Removed employee table from Salary Structure and added employee name in all forms 2018-05-02 14:33:37 +05:30
Nabin Hait
e9ad03e23e Documents order in hr page 2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd Added links in HR module 2018-05-02 14:31:03 +05:30
Shreya Shah
24e8f31be1 [Enterprise] Patch and child table changes (#13656)
* [patch] rename field

* Employee Property History child table

* remove child tables
2018-05-02 14:29:44 +05:30
Nabin Hait
2f77ccce1b New doctypes for HR and Accounting (#13652) 2018-05-02 14:27:19 +05:30
Umair Sayed
cd00f8f458 Updated domain pages (only content) and added few new help pages. (#13835)
* domain pages update

* domain docs

* domain pages

* help and domain pages
2018-05-02 12:21:35 +05:30
rohitwaghchaure
0065624fe0 Tax amount showing under wrong tax header in the report (#13843) 2018-05-02 12:20:55 +05:30
Faris Ansari
eae2ddac69 validate_conversion_rate in taxes_and_totals (#13880) 2018-05-02 12:19:30 +05:30
Zarrar
284de4c15a updated modified time - reload issue in patch (#13881) 2018-05-02 12:14:59 +05:30
Prateeksha Singh
9f97c97e25 Merge pull request #13832 from shreyashah115/color-field
Ability to add colour to all calendar type views
2018-05-01 19:00:41 +05:30
Shreya
0456ced796 remove unused code 2018-05-01 19:00:06 +05:30
Shreya
eb54331d5f removed color field from sales order and work order 2018-05-01 18:56:06 +05:30
Shreya
fd47b92138 renamed color field 2018-05-01 18:55:17 +05:30
Shreya
9c688f6dbf color field for calendar in leave application 2018-05-01 18:55:17 +05:30
Shreya
a7b2fc9250 color field for calendar in sales order and work order 2018-05-01 18:55:17 +05:30
Shreya
62907472f3 color field for calendar in task 2018-05-01 18:54:20 +05:30
Shreya
d71c0c1720 color field for calendar in holiday list 2018-05-01 18:54:20 +05:30
Shreya
4c8a08effb color field for calendar in course schedule 2018-05-01 18:54:20 +05:30
Prateeksha Singh
99be9d17d5 Merge pull request #13850 from netchampfaris/msgprint-to-alert
Change msgprint to alert
2018-05-01 18:52:49 +05:30
Faris Ansari
5df63e36d4 Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix 2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14 Change msgprint to unobtrusive alert 2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a display customer's name while printing receivable report (#13830) 2018-04-30 19:40:18 +05:30
Nabin Hait
48c0b3b328 Merge branch 'tundebabzy-new-subscription' into develop 2018-04-30 19:33:15 +05:30
Nabin Hait
3652a62b55 minor fixes 2018-04-30 19:32:29 +05:30
Prateeksha Singh
53c9b63c0b Merge pull request #13842 from pratu16x7/hotfix
[fix] setup_website, fixes #11143
2018-04-30 18:21:53 +05:30
Prateeksha Singh
9b2078feab [fix] setup_website, fixes #11143 2018-04-30 18:11:20 +05:30
Nabin Hait
d39386bd55 Renamed some salary related fields 2018-04-30 16:21:37 +05:30
Shreya
96e45902fd codacy 2018-04-30 15:54:34 +05:30
Faris Ansari
30304e68ff [fix] Current stock qty calculation in case of different UOM 2018-04-30 15:44:49 +05:30
Shreya
14bd43d5eb minor changes 2018-04-30 15:30:42 +05:30
Ameya Shenoy
da33b14f78 removed bad code and made compatible with pip 10 (#13805) 2018-04-30 11:17:12 +05:30
Shreya Shah
05ad2802c6 Travis test fixes for leave application (#13790)
* test fix

* expense claim test fix

* fix payroll entry test case
2018-04-30 11:14:56 +05:30
Zarrar
6bc500bffa [Minor] Validate dates in Salary Structure (#13807)
* validate date

* fix date trigger issue
2018-04-30 11:14:09 +05:30
Adam Dawoodjee
3cd4fce710 Typo fix (#13809) 2018-04-30 11:13:18 +05:30
Faris Ansari
8be895091e Set is_pos to 0 in Opening Invoice Tool (#13810) 2018-04-30 11:13:06 +05:30
Ameya Shenoy
f5f8a1f288 i still don't know why we're still using travis (#13817) 2018-04-30 11:10:39 +05:30
Gaurav Naik
c925a38f79 Ignore mandatory for default warehouses (#13812) 2018-04-27 15:31:11 +05:30
Manas Solanki
5cc41907a4 Merge pull request #13811 from frappe/manassolanki-patch-5
Remove the duplicate description
2018-04-27 12:47:24 +05:30
Manas Solanki
0536baacc2 Remove the duplicate description 2018-04-27 12:46:56 +05:30
Faris Ansari
9f739fe87d Handle item_wise_tax_detail invalid value while item renaming (#13778) 2018-04-26 18:48:01 +05:30
Kenneth Sequeira
b01f998b49 Update tracking-project-profitability-using-cost-center.md (#13792)
Fixed typo in the title.
2018-04-26 18:40:14 +05:30
AravindPranera
805f09a3fe Accounts receivable aging based on supplier due date (#13801) 2018-04-26 18:02:37 +05:30
deepak-mnt
b712d1905d Override after_rename method to fetch cost center number on changing from title 2018-04-26 17:04:06 +05:30
deepak-mnt
b379998961 Added Update Cost Center Number button and it's functionality 2018-04-26 17:00:08 +05:30
Nabin Hait
2f82bce387 minor fix 2018-04-26 16:32:17 +05:30
rohitwaghchaure
7e8a7ac6ee Provision to select opening stock in stock reconciliation (#13802) 2018-04-26 16:30:35 +05:30
Shreya
a20157af17 on item, warehouse and batch triggers, fetch serial nos based on batch 2018-04-26 14:39:21 +05:30
Shreya
7461d28ae0 add batch when creating serial nos 2018-04-26 14:39:21 +05:30
Shreya
4a2fe605b3 batch no field in serial no doctype 2018-04-26 14:39:21 +05:30
Nabin Hait
25ccd1acbb minor fix in asset 2018-04-26 12:16:38 +05:30
Nabin Hait
dc75be8b6c Show company column in order in consolidated financial statement 2018-04-26 12:16:38 +05:30
Siddhi Sawant
a16c8d0a2b Establishment / Effective Date field in the Company master (#13723) 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d [Fix] general ledger group by validation 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c [Fix] Profit and loss statment 2018-04-26 12:16:38 +05:30
Nabin Hait
074928cf6c Company field added in department 2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520 Fixed merge conflict 2018-04-26 12:16:18 +05:30
Nabin Hait
ee09408dcc Minor fixes 2018-04-26 12:16:18 +05:30
Pawan Mehta
2215d4c593 Shift Management (#13667)
* [fix] #13634

* review_changes

* rename function

* rename function
2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678)
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106 Group by party in general ledger report (#13649)
* Group wise Ledger for Customer and Supplier

* commonify group by fields
2018-04-26 12:16:18 +05:30
Pawan Mehta
0a17f8d51b remove shift schedule tool (#13658) 2018-04-26 12:16:18 +05:30
Nabin Hait
8076d6ddc8 Renamed Health Insurance to Employee Health Insurance 2018-04-26 12:16:17 +05:30
Nabin Hait
265426a5a6 Minor fixes 2018-04-26 12:14:02 +05:30
Nabin Hait
81706fdb46 Update rename_field_max_days_allowed.py 2018-04-26 12:14:02 +05:30
Nabin Hait
551844881b Removed employee table from Salary Structure and added employee name in all forms 2018-04-26 12:14:01 +05:30
Nabin Hait
fcdca7f2a0 Documents order in hr page 2018-04-26 12:13:46 +05:30
Nabin Hait
f914bd374d Added links in HR module 2018-04-26 12:13:24 +05:30
Shreya Shah
b15ef8450f [Enterprise] Patch and child table changes (#13656)
* [patch] rename field

* Employee Property History child table

* remove child tables
2018-04-26 12:13:06 +05:30
Pawan Mehta
8f14cb590c Add grade to employee master (#13654) 2018-04-26 12:12:45 +05:30
Nabin Hait
1c13e70d13 New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
Shreya Shah
ec38044fe2 New DocTypes for HR Module (#13650)
* New DocType Employee Incentive

* New DocType Shift Type

* New DocType Shift Assignment

* New DocType Shift Assignment Tool

* New DocType Shift Request

* New DocType Salary Structure Assignment

* Added Permissions

* New DocType Employee Lifecycle Process

* New DocType Employee Lifecycle Activity Type

* New DocType Employee Lifecycle Activity

* New DocType Employee Lifecycle Process Template

* New DocType Employee Lifecycle Process Template Detail

* Permissions and Auto Name

* New DocType Staffing Plan

* New DocType Staffing Plan Detail

* Added fields in Job Opening

* New DocType Employee Transfer

* New DocType Employee Promotion

* [minor]
2018-04-26 12:10:13 +05:30
Rushabh Mehta
369afce43c [patch] ignore validations while creating custom fields for gst via patch 2018-04-26 10:10:03 +05:30
Manas Solanki
30c267bec6 Merge pull request #13784 from KanchanChauhan/typo-fix
[Typo Fix] in Work Order
2018-04-25 17:23:36 +05:30
Kanchan Chauhan
7826dd1aeb Typo Fix in Work Order 2018-04-25 13:48:47 +05:30
Prateeksha Singh
c23230faea Merge pull request #13786 from pratu16x7/hotfix
[fix] featured product thumbnail
2018-04-25 13:04:19 +05:30
Prateeksha Singh
6855b87f76 [fix] featured product thumbnail 2018-04-25 13:03:11 +05:30
Saurabh
1d5bbe1081 Merge branch 'master' into develop 2018-04-25 12:46:50 +05:30
Saurabh
07d030208f Merge branch 'hotfix' 2018-04-25 12:46:48 +05:30
Saurabh
47f6e32920 bumped to version 10.1.27 2018-04-25 13:16:48 +06:00
Saurabh
7bd1453f8f Merge pull request #13785 from rohitwaghchaure/fix_patch_pos_taxes
[Fix] POS Patch
2018-04-25 12:44:20 +05:30
Rohit Waghchaure
bf416cfbf8 [Fix] POS Patch 2018-04-25 12:32:22 +05:30
Saurabh
63590496c1 [fix] resolved merge conflicts 2018-04-25 11:32:54 +05:30
Saurabh
67918fff32 Merge branch 'hotfix' 2018-04-25 11:31:48 +05:30
Saurabh
132dac9712 bumped to version 10.1.26 2018-04-25 12:01:48 +06:00
rohitwaghchaure
57914f140e [HotFix] Taxes not adding in POS sales invoice (#13776) 2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2 Minor fix in reloading email template 2018-04-24 17:51:13 +05:30
Shridhar Patil
02c93a3d05 [bug] Leave application ui issues fixed (#13740)
* validate to_date in leave application

if to_date is less than from_date show message to user
reset to_date value to ''

* var declaration and semicolon missed

* Updated popup message
2018-04-24 14:45:11 +05:30
Kenneth Sequeira
70330e8379 fixed user permission video link (#13774) 2018-04-24 14:12:41 +05:30
Shreya Shah
3cf35f2496 fix syntax (#13773) 2018-04-24 12:20:21 +05:30
Shreya Shah
4dc453d131 Loan Management for the Members (Non Profit Module) (#13149)
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account

* Patch added

* Dynamic link fields 'applicant' and 'applicant_type'

* Member link visible only if domain non profit is active

* Modified loan_dashboard

* Make Repayment Entry button

* Common file loan_common.js for loan and loan_application

* repayment schedule rows selection in dialog

* validation if repayment amount > total paid amount

* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month

* fetch nowdate if disbursement date not found

* Rebased with develop

* updated non-profit module page

* updated patch for renamed fields

* dialog to select repayment entries

* hidden field to store reschedule paid status

* update paid check in loan on journal entry updation

* calculate total paid

* updated docs

* codacy fix
2018-04-24 12:19:36 +05:30
bghayad
1c3830c53f Student Account Ledger Button (#13591)
* Student Account Ledger Button

* Student Account Ledger Button

* Student Account Ledger Button

* Student Account Ledger Button
2018-04-24 12:12:11 +05:30
Kenneth Sequeira
5becde7a45 embedded social login keys set up videos (#13659) 2018-04-24 12:11:29 +05:30
hiousi
38de994788 do not copy template description to variant if not in allow fields (#13726) 2018-04-24 12:10:45 +05:30
Saurabh
9738d52d5f Merge branch 'master' into develop 2018-04-24 12:09:40 +05:30
Saurabh
ede0af97cd Merge branch 'hotfix' 2018-04-24 12:09:38 +05:30
Saurabh
ad4ede0e23 bumped to version 10.1.25 2018-04-24 12:39:38 +06:00
Saurabh
cfcf9b3832 Merge pull request #13772 from saurabh6790/supp_240418
typo fix
2018-04-24 12:08:38 +05:30
Shreya Shah
6db3d84cc0 remove unused code (#13765) 2018-04-24 12:07:40 +05:30
Saurabh
d2065ce3bf typo fix 2018-04-24 12:07:37 +05:30
Rohit Waghchaure
31edddace6 [Fix] Tax not changes when user change the POS profile in the sales invoice 2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4 resolved merge conflicts 2018-04-24 11:16:13 +05:30
Saurabh
8f29159fb7 Merge branch 'hotfix' 2018-04-24 11:12:07 +05:30
Saurabh
d9f1b539dc bumped to version 10.1.24 2018-04-24 11:42:07 +06:00
Deepak kumar
022ac50160 Reverse Journal Entry (#13637)
* [Fix] #13605

* fixes codacy

* minor changes

* Added naming series for reverse journal entry

* added reference_type and reference_name
2018-04-24 10:52:28 +05:30
Manas Solanki
276a92539d Update move_leave_approvers_from_employee.py 2018-04-23 14:55:19 +05:30
Prateeksha Singh
60bd383a25 Merge pull request #13763 from pratu16x7/hotfix
[fix] cal view start end date field discrepancies
2018-04-23 13:34:49 +05:30
Prateeksha Singh
c0ec3c3f7b [fix] cal view start end date field discrepancies 2018-04-23 13:32:59 +05:30
Zarrar
68a7ee22f2 order_by for gantt error fix (#13752) 2018-04-23 13:22:03 +05:30
Shreya Shah
828f5ab29e Patch fixes (#13754)
* reload doc

* remove unused code
2018-04-23 13:21:35 +05:30
Manas Solanki
60aa1170d5 Merge pull request #13762 from manassolanki/fix-patient-appointment
fixed the gantt view of patient appointment
2018-04-23 12:39:28 +05:30
Manas Solanki
9630aa3d7f fixed the gantt view of patient appointment 2018-04-23 12:37:11 +05:30
Kenneth Sequeira
d4991cc49f Assets Docs Update (#13749)
* asset depreciation auto booking image added

* commit 3
2018-04-23 11:35:24 +05:30
Manas Solanki
aa6576c0ea Merge pull request #13755 from Zlash65/typo
[Minor] Typo fix in Leaderboard
2018-04-23 11:09:18 +05:30
tundebabzy
dbdf462e56 fix conflict 2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0 spelling: canceled --> cancelled 2018-04-22 23:43:08 +01:00
Zlash65
fa5ecb066e typo fix in leaderboard 2018-04-22 12:11:01 +05:30
Nabin Hait
c36524ec54 Update chart_of_accounts.py 2018-04-20 11:00:20 +05:30
Shreya Shah
44e719d64c [Enhancement] Leave Application and Expense Claim (#13645)
* child table employee expense approver

* set query in department

* mandatory approver check in hr settings

* triggers on leave and expense approver

* fetch all parent approvers from department hierarchy

* fixes

* patch to move employee approvers from employee to department

* removed hard coding of roles

* modify approvers list query

* commonified functions

* patch

* renamed standard reply occurrences

* removed leave approvers table from Employee master

* email templates for leave application notification

* set default email templates for leave in hr settings

* notify by email template

* approval status in expense claim

* render template in patch

* removed unused code

* Single child table department approver

* read instead of render template
2018-04-19 20:58:52 -08:00
Saurabh
cba3570cf6 Merge pull request #13734 from rohitwaghchaure/pos_special_character_item_issue
[Fix] Item with special character not adding in the POS cart
2018-04-19 15:58:35 +05:30
Saurabh
5b7503c074 Merge pull request #13691 from saurabh6790/supp_180417_1
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Rohit Waghchaure
8441dd9184 [Fix] Item with special character not adding in the POS cart 2018-04-19 12:55:06 +05:30
Julian Robbins
78869f1e77 Update manual-feedback-request.md (#13709)
Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'
2018-04-18 03:12:30 -08:00
Rushabh Mehta
ff8f1bc88e Revert "removed bad code and made compatible with pip 10 (#13685)" (#13713)
This reverts commit 91b0dce4d8.
2018-04-18 02:57:44 -08:00
Ameya Shenoy
91b0dce4d8 removed bad code and made compatible with pip 10 (#13685) 2018-04-18 02:57:04 -08:00
Zarrar
59f7b8c4a1 issue routing to report (#13710) 2018-04-18 02:56:02 -08:00
Saurabh
2476a8aab9 a[fix] check content before making in condition 2018-04-17 20:45:06 +05:30
Saurabh
46ffbb74ff fix cheque print measurements 2018-04-17 20:44:37 +05:30
tundebabzy
280c7a410a code review: make use of db_insert and change Auto Repeat to auto_repeat 2018-04-17 11:32:17 +01:00
tundebabzy
20721942ad code review: use delete from to delete records 2018-04-17 11:31:23 +01:00
tundebabzy
5988da9a31 code review: revert changes 2018-04-17 11:30:35 +01:00
Saurabh
492aff2a8b [fix] check if academic_year exists (#13665) 2018-04-17 14:21:40 +05:30
tundebabzy
caae0f4dcc Merge branch 'develop' into new-subscription 2018-04-17 09:34:04 +01:00
matmyers
742da8cfce removed duplicate keys (#13675) 2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6 Merge branch 'master' into develop 2018-04-17 12:00:21 +05:30
Saurabh
c3fbc04aab Merge branch 'hotfix' 2018-04-17 12:00:19 +05:30
Saurabh
5b866db6bc bumped to version 10.1.23 2018-04-17 12:30:19 +06:00
Saurabh
9fbb8192e1 [fix] do not escape % while using clause (#13677) 2018-04-17 11:56:46 +05:30
Faris Ansari
d7a3b78fdf [py3] Cast dict_keys to list (#13663) 2018-04-16 14:39:37 +05:30
Saurabh
ea1408f2e0 [fix] enqueue salary slip print email after completing accounting entries (#13633) 2018-04-15 21:38:49 -08:00
Saurabh
f2a941b1a4 [fix] check if supplier value exists (#13616) 2018-04-15 21:37:14 -08:00
Sanjay Kumar
bc83daf0fa #13478 : Default Accounts in Item from Item Group (#13635)
* remove external app reference and update get_warehouse_list

* resolve #13478 : Default Accounts in Item from Item Group
2018-04-15 21:36:37 -08:00
Saurabh
ea49deb315 Merge branch 'master' into develop 2018-04-15 12:54:50 +05:30
Saurabh
ca1cfd91ea Merge branch 'hotfix' 2018-04-15 12:54:49 +05:30
Saurabh
c3d43e672b bumped to version 10.1.22 2018-04-15 13:24:49 +06:00
Saurabh
e141fdcfcc Merge pull request #13661 from codingCoffee/pip10
Compatibility for pip 10
2018-04-15 12:43:28 +05:30
Ameya Shenoy
7cb8f890bc Compatibility for pip 10
- also some spaces and tabs fixes
2018-04-15 03:43:21 +05:30
Sathisha Poojary
16ce8ed7d5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-04-14 12:05:11 +05:30
Faris Ansari
ed34a442a8 Obey currency filter in financial statement prints #pdd (#13648) 2018-04-13 21:34:00 -08:00
Shreya Shah
a952e40b56 fix tab (#13651) 2018-04-13 19:33:40 +05:30
Shreya Shah
6bf4e5b73b Department Tree (#13567)
* Department Tree

* print hide fields

* create 'All Departments' as parent on setup

* patch to set lft rgt

* fix translatable string
2018-04-13 15:09:26 +05:30
Nabin Hait
642d39098a Fixed merge conflict 2018-04-13 14:38:57 +05:30
Nabin Hait
d6aadef395 Merge branch 'hotfix' 2018-04-13 14:38:23 +05:30
Nabin Hait
11c899bc1f bumped to version 10.1.21 2018-04-13 15:08:22 +06:00
Nabin Hait
00efeb26f4 Email Account field added in Issue 2018-04-13 14:30:26 +05:30
Nabin Hait
4566d1f60c Email Account field added in Issue 2018-04-13 13:26:06 +05:30
Faris Ansari
f8dd4c2d7b [fix] Financial report column values during print (#13627) 2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b GST purchase invoice with tax breakup details (#13561) 2018-04-12 14:50:48 +05:30
rohitwaghchaure
1129ac711e [Fix] Patch (#13610) 2018-04-12 14:48:23 +05:30
rohitwaghchaure
2ea593bdd8 [Fix] POS Profile data not set in the sales invoice (#13568) 2018-04-12 13:37:08 +05:30
Frappe PR Bot
59a2a653d0 [Translation] Updated Translations (#13570) 2018-04-12 13:36:55 +05:30
Ahmed Madi
02fd6f56d6 Update leave_application.py (#13575)
Make get_holidays function white listed
2018-04-12 13:31:50 +05:30
Pawan Mehta
c0727633e7 [fix] #13589 (#13590) 2018-04-12 13:31:08 +05:30
rohitwaghchaure
098b444f6f [minor] Toggle required opportunity item table based on with items field (#13584) 2018-04-12 13:26:50 +05:30
rohitwaghchaure
e72bde5159 Removed expired items from the list of POS items (#13582) 2018-04-12 13:26:11 +05:30
Nabin Hait
c10e106f8f Optimization related to large number of items (#13606) 2018-04-12 13:25:03 +05:30
Ameya Shenoy
848d34f1a8 Minor fixes (#13609)
- typo renamed make_prod_order_test_record to make_wo_order_test_record,
whereever it was missed
2018-04-12 13:21:16 +05:30
rohitwaghchaure
2c111b7b14 Minor fix (#13600) 2018-04-11 02:20:06 -08:00
Sanjay Kumar
6225b769a6 remove external app reference and update get_warehouse_list (#13597) 2018-04-11 02:19:36 -08:00
Rushabh Mehta
fb5d678b0c [minor] cache refactor and workflow docs (#13598) 2018-04-11 00:38:19 -08:00
Doridel Cahanap
ad76f9ad70 [Enhancement] Work Order Material Consumption (#13384)
* Work Order Material Consumption

* Test cases and other minor fixes

* Test cases fixes

* Travis Fixes

* Work Order Material Consumption Request Changes

* Update work_order.js
2018-04-09 10:31:28 +05:30
Sathisha Poojary
99e3ca0f67 Create a new doctype for bank so that we can suport other
bank statements dynamically.
2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032 fixed merge conflict 2018-04-06 15:18:27 +05:30
Nabin Hait
f92fcdbac4 Merge branch 'hotfix' 2018-04-06 15:06:09 +05:30
Nabin Hait
1ff9e0432a bumped to version 10.1.20 2018-04-06 15:36:09 +06:00
rohitwaghchaure
c0f149a3be [Fix] Delivery notification for delivery trip (#13543) 2018-04-06 14:26:26 +05:30
Dominik Ottenbreit
82eac06505 Add Order Confirmation to PO (#13421) 2018-04-06 11:51:18 +05:30
rohitwaghchaure
2ae6cfda5f [Fix] Item variant details report (#13545) 2018-04-06 11:49:04 +05:30
KanchanChauhan
4691af6348 Get Payment Schedule from Sales Order to Sales Invoice (#13497) 2018-04-06 11:23:19 +05:30
Kenneth Sequeira
2d79e46fbd updated images for print format (#13498) 2018-04-06 11:22:37 +05:30
Jamsheer
86fd8cbf68 Healthcare dashboard (#13533)
* Healthcare Dashboards

* Lab Test and Template - field marked in_filter = True
2018-04-06 10:29:23 +05:30
rohitwaghchaure
22d9f0a4aa [Fix] Bin not deleted on delete of an item (#13539) 2018-04-06 10:29:07 +05:30
Saurabh
b0e409d4a8 syntax fix (#13542) 2018-04-06 10:28:40 +05:30
Rushabh Mehta
dccfb54a0f [fix] [ux] allow account to be created via form (#13509) 2018-04-06 10:28:08 +05:30
Zarrar
92109b01fd translate while creating items from user progress (#13530) 2018-04-06 10:27:55 +05:30
Manas Solanki
76cbf0a044 Merge pull request #13544 from frappe/manassolanki-patch-4
Update setup.py
2018-04-05 21:36:01 +05:30
Manas Solanki
b2f9af71d2 Update setup.py 2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e Group email fields together and add IFSC Code (#13535)
* [fix] #13534

* change field order cell no
2018-04-05 14:54:51 +05:30
Prateeksha Singh
59147c0368 Merge pull request #13538 from pratu16x7/hub-fixes
[fix] company listing context
2018-04-05 14:53:11 +05:30
Prateeksha Singh
4b7dcfad54 [hub] add hub settings access regardless 2018-04-05 14:50:42 +05:30
Prateeksha Singh
420c79041e [fix] company listing context 2018-04-05 14:44:16 +05:30
Suraj Shetty
97d84eb509 remove apply user permission (#13505) 2018-04-05 12:10:46 +05:30
Zarrar
0e3b000e81 sql syntax fix (#13529) 2018-04-05 10:34:30 +05:30
rohitwaghchaure
d77e8e5b02 Merge pull request #13521 from rohitwaghchaure/pos_freeze_when_change_rate
[Fix] POS freeze when rate button pushed
2018-04-04 18:10:12 +05:30
Rohit Waghchaure
920a3ff0b8 [Fix] POS freeze when rate button pushed 2018-04-04 18:06:19 +05:30
rohitwaghchaure
aa7cddef5c Merge pull request #13511 from rohitwaghchaure/table_styling
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4 [Fix] Width and margin for account receivable pdc print format 2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Nabin Hait
821222653b Merge branch 'hotfix' 2018-04-04 11:26:19 +05:30
Nabin Hait
adddb15380 bumped to version 10.1.19 2018-04-04 11:56:19 +06:00
Nabin Hait
5fd79f7f77 Update stock_ledger.py 2018-04-04 11:20:16 +05:30
Vishal Dhayagude
2505c74d64 Place of Supply set on save Delivery Note if Customer Address Present (#13492) 2018-04-04 11:05:21 +05:30
Achilles Rasquinha
ecfc10e21c Merge pull request #13500 from frappe-pr-bot/translations-2018-04-03
[Translation] Updated Translations
2018-04-03 19:32:43 +05:30
frappe-pr-bot
6623cdc244 [Translation] Updated Translations 2018-04-03 15:49:16 +02:00
Vinayak Jethe
df83148d7c Woocommerce Integration (#13217)
* WIP for WooCommerce Integration

* WIP for WooComm Integration

* WIP WooComm

* Added Woocommerce Settings

* Woocommerce Settings

Enable Sync Makes fields mandatory

* Woocommerce whitelisted endpoints

* [Clean Up] Woocommerce Settings

* Verify Webhook Data

* Fix Verify Webhook

* WIP WooComm

* WIP and working few modules

* Customer creating partially

* Customer creation successful

* Refactored Customer code

* WIP Address

* Fixed address and customer bug. Now working fine

* WIP for products. Creation of items successful

* Handling json for product

* Products creating and updating properly

* Custom checkbox for required doctypes

* Product feature fully completed

* WIP orders

* Sales order working properly

* Orders mapping successfully

* New version Customer Working Properly

* Items creation properly

* Working on sales order

* Orders comming successfully

* Bug fixes

* Fixed date format for delivery date

* Code Cleanup

* Woo setting page modified

* Fixed minor bug

* Fixes

* Minimum Viable Product

* Cleanup

* Removed duplicate file from erpnext config

* Added more default changes to woo settings

* Fixes as per required

* Fixes

* Bug fix

* few changes and fix

* Fixing

* Fixes with test

* Added Test for Woocommerce - Emulates request

* Fix woocommerce test

* fix woocommerce test

* verify_request: py3 ready

* Codacy fixes

* WooCommerce Integration Docs

* Codacy changes

* Codacy fixes

* User set tax account

* Fixes for account

* Fix for warehouse issue

* Docs updated

* Codacy fix

* Updated Docs

* Minor changes

* Tested added for repeat order and cleanup

* Minor change

* docs and gifs renamed according to convention

* Doc updated
2018-04-03 11:17:03 +05:30
Prateeksha Singh
b60a52b194 Hub Market (#13325)
* [hub] enable hub with OAuth token from user's client ID

* [hub] settings schema for adding users

* [hub] image view style listing

* [hub] broken image link fallback

* [wip]

* [hub] bootstrap timeline

* [hub] setup quick view

* [hub] reformat ratings, add companies autocomplete filter

* [hub] common listing frames

* [hub] setup sort selector

* [hub] timeline

* [hub] customize list header

* [hub] genuine form fieldtypes

* [hub] review products

* [hub] suggest missing categories remotely

* [hub] Wishlist; header and title templates

* [hub] link wishlist, remove company migration

* [hub] calculate ratings
2018-04-03 10:44:13 +05:30
Suraj Shetty
c5effbf009 Data export tool doc (#13419)
* data export tool docs

* change doc gif path
2018-04-03 10:43:08 +05:30
Frappe PR Bot
dc0a92c8de updated translations (#13485) 2018-04-02 23:46:54 +05:30
Rushabh Mehta
d5f9ebd008 [optimize] item queries (#13480) 2018-04-02 23:37:33 +05:30
Achilles Rasquinha
325ce05044 Merge pull request #13475 from rohitwaghchaure/fixed_travis
[Fix] Travis
2018-04-02 17:02:39 +05:30
Rohit Waghchaure
395d61b998 [Fix] Travis 2018-04-02 15:11:47 +05:30
rohitwaghchaure
eedc0ac681 [Fix] chart of accounts root type is mandatory issue in charts.erpnext.com (#13467) 2018-04-02 12:49:38 +05:30
Britlog
220864b4f7 Allow decimal quantities in pos (#13471) 2018-04-02 10:55:04 +05:30
Charles-Henri Decultot
6860036b01 Agriculture module corrections (#13438)
* Agriculture module corrections

* Update ternary_plot.js
2018-04-02 10:51:53 +05:30
Nabin Hait
c825e914d1 Added indexes for lft, rgt on nestedset doctypes (#13420) 2018-04-02 10:43:46 +05:30
Shreya Shah
d021e45301 exclude current doc while validating (#13450) 2018-04-02 10:43:19 +05:30
Zarrar
e9ca5e81d2 hide add_child for root node (#13444) 2018-04-02 10:40:39 +05:30
Shreya Shah
5d71609f0b Timer fixes (#13443)
* alert for exceeded time only when dialog is open

* fetch row having an activity without from_time

* fixes if timesheet created from work order

* reset timer limit exceeded
2018-04-02 10:32:39 +05:30
Manas Solanki
a7f5589564 fix for the update button in the sales invoice (#13435) 2018-04-02 10:32:00 +05:30
Nabin Hait
edd320e338 Optimisation of warehouse_account_map (#13454) 2018-04-02 10:30:17 +05:30
Kenneth Sequeira
84fe32d05c removed pos-view article since it is deprecated (#13456) 2018-04-02 10:26:43 +05:30
Shreya Shah
a8df73c263 typo in landed cost voucher doc (#13472) 2018-04-02 10:16:27 +05:30
rohitwaghchaure
40a5a3063c [Fix] Allow zero valuation rate if previous sle has zero valuation rate (#13432) 2018-04-02 10:14:49 +05:30
Nabin Hait
af98f5d14d Sort accounts by account number in financial statements (#13423) 2018-04-02 10:14:32 +05:30
Shreya Shah
d17c24f969 set query in payment account (#13446) 2018-04-02 10:13:48 +05:30
Manas Solanki
0289ad285f fix the route filters and payment account (#13447) 2018-04-02 10:13:22 +05:30
Shreya Shah
562227db8f db escape as single quote in address causes error (#13451) 2018-04-02 10:12:37 +05:30
Achilles Rasquinha
9c1cac80fe Merge pull request #13445 from shreyashah115/typo-in-payroll
Typo in Payroll Entry
2018-04-01 10:29:16 +05:30
Sathisha Poojary
1de5669574 Rename Bank Statement Settings appropriately and allow auto
populating some settings for supported banks
2018-03-31 10:30:34 +05:30
Sathisha Poojary
f698a1bcbe Minor typo with major error 2018-03-31 01:19:52 +05:30
Sathisha Poojary
f069e1c83c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-31 00:55:56 +05:30
rohitwaghchaure
456fdf09cb Merge pull request #13449 from rohitwaghchaure/pos_not_working_issue
[Fix] POS not opening
2018-03-30 14:29:56 +05:30
Rohit Waghchaure
5e0cabc538 [Fix] POS not opening 2018-03-30 14:29:18 +05:30
Gaurav Naik
03016e5000 Exploded view for BOM Stock Report (#12506)
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
2018-03-30 13:03:19 +05:30
Shreya
9240eaa0a6 typo for accrual journal entry 2018-03-30 12:19:11 +05:30
Manas Solanki
618940b5c9 Merge pull request #13433 from manassolanki/fix-pe
minor fix for the program enrollment tool
2018-03-29 16:37:54 +05:30
Manas Solanki
ccf2b7b08b minor fix for the program enrollment tool 2018-03-29 16:36:59 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Nabin Hait
1e989b35ad Merge branch 'hotfix' 2018-03-29 13:53:00 +05:30
Nabin Hait
cae2723920 bumped to version 10.1.18 2018-03-29 14:23:00 +06:00
rohitwaghchaure
badc855400 [Fix] BOM validation issue for scrap item (#13429) 2018-03-29 13:48:38 +05:30
Manas Solanki
a4502c4f6b Merge pull request #13430 from codingCoffee/child_doc_perm_fix
Permisssion fixes for child table
2018-03-29 13:27:08 +05:30
Manas Solanki
1f02c62339 Merge pull request #13431 from manassolanki/fix-22
fix the item varint details
2018-03-29 13:26:14 +05:30
Manas Solanki
ef770b593a fix the item varint details 2018-03-29 13:25:00 +05:30
Manas Solanki
a9c90c96a9 Merge pull request #13428 from frappe/manassolanki-patch-3
Update get_item_details.py
2018-03-29 13:16:40 +05:30
Ameya Shenoy
c5d222253a Permisssion fixes for child table
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
2018-03-29 13:16:08 +05:30
Manas Solanki
94769d81a8 Update get_item_details.py 2018-03-29 11:15:05 +05:30
rohitwaghchaure
edd63a178f Merge pull request #13418 from rohitwaghchaure/pdf_and_alignment_issue
[Fix] Alignment and date issue in PDC report
2018-03-28 17:17:37 +05:30
Rohit Waghchaure
ace68cd283 [Fix] Alignment and date issue in PDC report 2018-03-28 15:53:29 +05:30
Nabin Hait
4d9e104284 Merge branch 'master' into develop 2018-03-28 15:51:18 +05:30
Nabin Hait
d3bd151c30 Merge branch 'hotfix' 2018-03-28 15:51:16 +05:30
Nabin Hait
0794816527 bumped to version 10.1.17 2018-03-28 16:21:16 +06:00
Nabin Hait
7041a45294 Update fix_reserved_qty_for_sub_contract.py 2018-03-28 15:50:14 +05:30
Dominik Ottenbreit
561e2a534b Add Project Standard Filters (#13417) 2018-03-28 14:25:51 +05:30
rohitwaghchaure
68ba4fd697 [Fix] Multi-batch selection issue in POS (#13407) 2018-03-28 12:33:15 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121)
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
2018-03-28 11:51:44 +05:30
Nabin Hait
a6746407e5 Fixed waiting qty in item dashboard data 2018-03-28 11:16:12 +05:30
Nabin Hait
6c35822a35 Merge branch 'master' into develop 2018-03-28 10:40:14 +05:30
Nabin Hait
e3407083fe Merge branch 'hotfix' 2018-03-28 10:40:12 +05:30
Nabin Hait
63e40b52af bumped to version 10.1.16 2018-03-28 11:10:12 +06:00
Nabin Hait
2e203e53c6 Update fix_reserved_qty_for_sub_contract.py 2018-03-28 10:38:55 +05:30
Sathisha Poojary
148c4f9724 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-28 00:27:32 +05:30
Sathisha Poojary
0512eec54b Some minor changes addressing manual doctype renaming issues 2018-03-28 00:22:59 +05:30
Shreya Shah
c0201877dd fixed column fieldnames for translations (#13406) 2018-03-27 18:45:42 +05:30
Nabin Hait
9db28ef90d Minor fix in patch 2018-03-27 16:00:57 +05:30
Zarrar
7f4cd3f5ea Update Docs for Work Order (#13403)
* update docs

* rename files, update pngs

* update pngs for timesheet, leftover changes
2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Nabin Hait
745292ce98 Merge branch 'hotfix' 2018-03-27 14:22:28 +05:30
Nabin Hait
00279f27f3 bumped to version 10.1.15 2018-03-27 14:52:27 +06:00
Nabin Hait
f620dae8ca Null issue fixed in gstr reports 2018-03-27 14:15:36 +05:30
Nabin Hait
9d7fe1f7cd Indicator fix for stock entry item table 2018-03-27 13:30:11 +05:30
Prateeksha Singh
ffaed1ce2e Merge pull request #13404 from pratu16x7/variants
Enumerate numeric values in variant dialog
2018-03-27 12:18:13 +05:30
Prateeksha Singh
be368fe94b Enumerate numeric values in variant dialog 2018-03-27 12:17:15 +05:30
Shreya Shah
ba4f32be5c set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398) 2018-03-27 11:32:10 +05:30
rohitwaghchaure
85f63a3866 [Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392) 2018-03-27 11:31:44 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374)
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
2018-03-27 11:29:25 +05:30
rohitwaghchaure
c9a1eb1081 [Fix] Not able to delete row in modal table (#13377) 2018-03-27 11:26:43 +05:30
rohitwaghchaure
2e560cb25d [Fix] Same serial no returned two times (#13378) 2018-03-27 11:24:50 +05:30
Nabin Hait
651b612909 Fixed logic for reserved qty for subcontract and production and written a patch (#13396)
* Fixed logic for reserved qty for subcontract and production and written a patch

* repost reserved qty for filtered bins
2018-03-27 11:24:20 +05:30
Manas Solanki
398eac3f4c message in the program enrollment tool (#13393) 2018-03-27 11:21:47 +05:30
Frappe PR Bot
7db805a031 [Translation] Updated Translations (#13394) 2018-03-27 11:21:08 +05:30
Shreya Shah
f3025f1596 operation time in grid view (#13400) 2018-03-27 10:34:05 +05:30
Prateeksha Singh
e45f957ad9 Merge pull request #13363 from shreyashah115/timer
Timer in Timesheets!
2018-03-27 10:28:50 +05:30
Sathisha Poojary
0b5fea1491 Initial changes to manually migrating bank statemet work from
app to erpnext
2018-03-26 01:12:18 +05:30
Nabin Hait
061d912749 Fixed merge conflict 2018-03-23 16:20:27 +05:30
Nabin Hait
0712013960 Merge branch 'hotfix' 2018-03-23 16:05:06 +05:30
Nabin Hait
3fdda7a9b7 bumped to version 10.1.14 2018-03-23 16:35:06 +06:00
Shreya Shah
9bcadf8126 Tax Id in some reports and print formats (#13373)
* tax-id in sales and purchase registers

* tax-id in general ledger print_format

* tax-id in accounts payable

* tax-id in accounts receivable
2018-03-23 15:04:37 +05:30
rohitwaghchaure
492de67d7b Added consumed material cost in project (#13365) 2018-03-23 15:02:04 +05:30
Nabin Hait
80a9f523d5 Minor fix AR/AP summary report 2018-03-23 13:02:27 +05:30
Shreya
8bb0f05451 added task field 2018-03-23 11:46:45 +05:30
Shreya
7619cd2e14 updated docs for timesheet 2018-03-23 11:41:56 +05:30
Shreya
822ba21f38 codacy fix 2018-03-23 11:41:56 +05:30
Shreya
559011404a removed timesheet.html, appended it as a helper function 2018-03-23 11:41:56 +05:30
Shreya
5bf24be704 minor fixes 2018-03-23 11:41:56 +05:30
Shreya
8f06266838 all fields editable 2018-03-23 11:41:55 +05:30
Shreya
5714260af4 replaced status with completed checkbox 2018-03-23 11:41:55 +05:30
Shreya
09937f3753 modified timer start button 2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2 thanks to faris for the css 2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c moved timer.js to public/js 2018-03-23 11:41:55 +05:30
Shreya
05e516efc4 Start the timer on the basis of time diff between now_time and timestamp 2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db New activity dialog removed, read only fields editable if no rows found, add a new row on timer start 2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9 new field actual_end_time to record completed time 2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8 CSS modifications 2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec new dialog to create activity 2018-03-23 11:41:55 +05:30
Shreya
643528a3b8 added status field 2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104 removed stop button and added a complete button 2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b read only fields project and hours 2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627 alert sound when timer exceeds the given hours 2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d timer in timesheet 2018-03-23 11:41:55 +05:30
Faris Ansari
35397a1033 Salary Register (#13367)
- convert date range to from_date and to_date
2018-03-22 15:26:45 +05:30
Nabin Hait
e3f0412570 Pass doc while autonaming item 2018-03-22 12:13:21 +05:30
rohitwaghchaure
6a2d073fe1 Merge pull request #13353 from PawanMeh/fixes_13352
Add total qty to offline POS
2018-03-22 11:36:32 +05:30
rohitwaghchaure
23fa8893a8 [Fix] Division by zero issue (#13362) 2018-03-22 11:16:00 +05:30
Faris Ansari
34dd079a68 Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
Manas Solanki
a3714e1678 Merge pull request #13360 from frappe/manassolanki-patch-3
Update update_project_in_sle.py
2018-03-21 18:25:26 +05:30
Manas Solanki
0f6c35d63f Update update_project_in_sle.py 2018-03-21 18:24:45 +05:30
Faris Ansari
4fc74333bd Fix Icons for Expense Claim and Timesheet (#13359) 2018-03-21 17:54:09 +05:30
Kenneth Sequeira
6a92cdc358 Update cost-center.md (#13354)
Fixed link to missing image for cost centre.
2018-03-21 17:52:52 +05:30
rohitwaghchaure
93779c21a7 [Fix] Project not set in the stock ledger entry (#13357) 2018-03-21 17:52:41 +05:30
Manas Solanki
e010ddf65f Student Report Card (#13346)
* finalise the assessment report

* minor fixes for button

* fix the travis and codacy
2018-03-21 17:50:42 +05:30
Zarrar
969c8aaf52 [Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198)
* customer code can be assigned based on customer group

* improvise customer group selection

* requested changes made
2018-03-21 11:17:49 +05:30
Manas Solanki
c711445b91 add the student as party type (#13348) 2018-03-21 10:12:27 +05:30
rohitwaghchaure
2b88ac948e [Fix] Special character issue (#13350) 2018-03-21 10:04:47 +05:30
pawan
53a4d2c430 [fix] #13352 2018-03-21 09:19:36 +05:30
Faris Ansari
ce08aabc84 Add Kanban Board button in project (#13345) 2018-03-20 19:03:32 +05:30
Prateeksha Singh
59057c6675 Merge pull request #13341 from Zlash65/min-fix
[Minor] Fix unindented code
2018-03-20 16:35:18 +05:30
Zlash65
0859018c48 unindented code 2018-03-20 16:29:27 +05:30
Siddhi Sawant
c672530210 [hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316)
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats

* Update gst_pos_invoice.json

Updated its 'disabled' property.

* Update pos_invoice.json

Updated its 'disabled' property.

* Shows change amount only if it exists

* Updated disable property of print formats
2018-03-20 14:31:14 +05:30
Britlog
e3a9b9fe49 [Website] Price in items list and sales uom management (#13335)
* Price in items list and sales uom management

* Price in product search page

* Display website stock in sales uom

* Add set_product_info_for_website to avoid duplicate code

* Add price uom in item list and page

* Update product.py
2018-03-20 14:28:44 +05:30
Zarrar
9a01baac1d explicitely provide order_by (#13338) 2018-03-20 14:08:44 +05:30
Achilles Rasquinha
0575b3e1c3 fixed inconsistent tab error (#13339) 2018-03-20 14:07:25 +05:30
Charles-Henri Decultot
d0ac69704f Chained log report doc (#13314) 2018-03-20 13:12:28 +05:30
Zarrar
c5b061834b doctype dropdown rectify, validate series is set (#13305) 2018-03-20 13:06:18 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order (#12902)
* remove occurrences of Production Order

* rename from report and jsons

* Change Production Order to Work Order

* change occurences of production order from other files

* resolve minor conflict issues and reports

* patch added

* codacy fix

* updated patches, leftover changes

* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
Doridel Cahanap
c893268dea Add Health Insurance Doctype and link to Employee (#13257) 2018-03-20 12:37:02 +05:30
Deepak kumar
656ff36c76 [Feature] Advance Account Balance in Employee Advance (#13263)
* added due advance amount field to show due amount

* fixes codacy

* made whitelisted method

* Update employee_advance.js
2018-03-20 12:35:02 +05:30
Nabin Hait
d97c5a04b2 minor fix in item naming 2018-03-20 12:31:05 +05:30
Tom Price
cd525299ee [Feature] Add default duration and color to appointment type (#13296)
* Add default duration and color to appointment type

When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment.
`Appointment Type.color` is used in the calendar display.

* Remove accidental fixed date from git

* Update modified timestamp to ensure migrations.

Set to the timestamp of dd506a0961
2018-03-20 12:08:44 +05:30
Mark Walker
f572522f25 Copy source project into Purchase Order Item (#13321) 2018-03-20 12:06:04 +05:30
renzodemie
417dfed214 Daily Reminder (#12938)
* for email sending

* test commit for new branch

* Removed test changes

* test commit renzo

* Email sending

* Project Uo

* Project Update

* "My first commit"

* "My second commit"

* "My second commit"

* Holiday is included

* delete idea

* first pull

* first pull

* "My third commit"

* Delete idea

* delete again

* "Edit Time"

* "Edit Time"

* Naming series and bug fixing

* "Edit current day and time"

* "Proper naming series, hidden time and date"

* Project and Project Update dashboard

* dashboard

* Remove hooks for PR

* Remove hooks for PR

* Remove hooks for PR

* Deleted project_time.py

* Corrected indention

* Hook back to original

* Delete project_time.py

* "Modified time"

* Fix indention

* Sample

* FRM

* FRM

* Time fix

* Hooks original state

* "Modified time"

* Added permission to Project User

* Added function/method to be called in order to create project update for the specific project

* Naming series

* this is not included

* Fix minor bug

* Indent again

* "Reformat Code"

* "Check Indent"

* Indent again and again

* semi colon

* "Check Again Indent"

* "Check again Indent"

* "Check again Indent"

* ind

* "Check again Indent"

* "Check again Indent"

* Generate Project update
With button in email

* []

* "Erro Summary"

* "Add syntax for the communcation"

* "add summary code"

* "Modified Summary code"

* "Modified Summary code"

* "Fix update ID and set localhost"

* Fix time and date error in project_update
Fix naming series problem in project_update

* included "not updated" in project update

* Bug in Number of Drafts

* "add notes in summary"

* Correct code

* With error

* Removed the method

* Minor fixes

* Correction for daily summary
2018-03-20 11:58:15 +05:30
Nabin Hait
8a8966ce9b minor fix 2018-03-20 11:19:57 +05:30
Achilles Rasquinha
aa4d7a3436 Update .travis.yml 2018-03-20 01:37:27 +05:30
Achilles Rasquinha
58606b643a Updated .travis.yml for Python 2 and 3 2018-03-20 01:35:50 +05:30
Achilles Rasquinha
54f3a0f7c6 Merge pull request #13333 from achillesrasquinha/hotfixes
Check Set Sales Target Item exists in User Slides
2018-03-19 22:23:11 +05:30
Achilles Rasquinha
ecc4fdd3ef Check Set Sales Target Item exists in User Slides 2018-03-19 22:21:45 +05:30
Achilles Rasquinha
b714643ca2 Merge pull request #13332 from achillesrasquinha/fixes
Check Set Sales Target Item exists in User Slides
2018-03-19 22:18:20 +05:30
Achilles Rasquinha
d0786b45c3 fix issue 2018-03-19 22:17:37 +05:30
Achilles Rasquinha
60da37b502 Merge pull request #13329 from shreyashah115/travis-fix
[Fix] Travis
2018-03-19 19:10:21 +05:30
Saurabh
2777fd4332 [fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328) 2018-03-19 18:29:01 +05:30
Shreya
9602bf4ba3 patch fix 2018-03-19 18:17:54 +05:30
Shreya
5042dd32da undefined args error 2018-03-19 17:45:39 +05:30
Shreya
4d347b1ca0 travis fix 2018-03-19 17:31:19 +05:30
Achilles Rasquinha
034834d671 Merge pull request #13326 from shreyashah115/fix-travis
[Fix] Travis
2018-03-19 17:00:34 +05:30
Shreya
f7b39438d2 travis fix 2018-03-19 14:19:55 +05:30
Achilles Rasquinha
3099ea67a1 Merge pull request #13303 from achillesrasquinha/py3
unordered types None vs int
2018-03-19 11:54:24 +05:30
Achilles Rasquinha
3d85951c1f Merge pull request #13304 from achillesrasquinha/hotfix-hub
[HOTFIX] Hub Domain Change
2018-03-19 11:54:13 +05:30
Achilles Rasquinha
984ec2652e Merge pull request #13322 from achillesrasquinha/fixes
Fixed dict_keys concatenation
2018-03-18 10:09:48 +05:30
Achilles Rasquinha
1e95323679 Fixed dict_keys concatenation 2018-03-18 10:08:43 +05:30
Manas Solanki
7b91042ae6 Merge pull request #13310 from manassolanki/student-report-card
addition of student report card generation tool
2018-03-16 02:00:07 +05:30
Manas Solanki
633a39144d addition of student report card generation tool 2018-03-16 01:57:45 +05:30
Achilles Rasquinha
94b41ea4f6 removed debugging 2018-03-15 12:53:22 +05:30
Achilles Rasquinha
d8f7de9946 fixed patch for hub 2018-03-15 12:48:32 +05:30
Nabin Hait
c8cd4ba6f7 Merge branch 'master' into develop 2018-03-15 12:38:43 +05:30
Nabin Hait
b2d318ec48 Merge branch 'hotfix' 2018-03-15 12:38:41 +05:30
Nabin Hait
60200eaf0d bumped to version 10.1.13 2018-03-15 13:08:41 +06:00
Nabin Hait
1e4cfb4bf5 Fixes in setting po nos manually in sales invoice 2018-03-15 12:27:24 +05:30
Nabin Hait
70abac0061 Get territory from sales invoice 2018-03-15 12:19:16 +05:30
Achilles Rasquinha
a4a62d5ea1 unordered types None vs int 2018-03-15 12:18:37 +05:30
Nabin Hait
bb5caf8fad Merge branch 'master' into develop 2018-03-14 13:33:38 +05:30
Nabin Hait
d7f32e492f Merge branch 'hotfix' 2018-03-14 13:33:36 +05:30
Nabin Hait
6c09297bcd bumped to version 10.1.12 2018-03-14 14:03:36 +06:00
Nabin Hait
363cedde76 Fixed minor issue 2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5 Merge branch 'master' into develop 2018-03-13 18:13:44 +05:30
Nabin Hait
f5ad339cae Merge branch 'hotfix' 2018-03-13 18:13:43 +05:30
Nabin Hait
c8c733bc54 bumped to version 10.1.11 2018-03-13 18:43:42 +06:00
Shreya Shah
7acc8cb747 fix else condition (#13295) 2018-03-13 18:12:19 +05:30
Nabin Hait
e01dcc170c Merge branch 'master' into develop 2018-03-13 17:11:52 +05:30
Nabin Hait
9a398b4742 Merge branch 'hotfix' 2018-03-13 17:11:49 +05:30
Nabin Hait
56882033bf bumped to version 10.1.10 2018-03-13 17:41:49 +06:00
Nabin Hait
74c817e7f9 Update update_reserved_qty_for_purchase_order.py 2018-03-13 17:10:14 +05:30
Nabin Hait
3707242770 Fixed merge conflict 2018-03-13 16:15:41 +05:30
Nabin Hait
d98a6d81eb Merge branch 'hotfix' 2018-03-13 16:14:02 +05:30
Nabin Hait
baac05955b bumped to version 10.1.9 2018-03-13 16:44:02 +06:00
Nabin Hait
89346967da Reverted #13259 (#13291) 2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3 Fix in unallocated amount calc in payment entry (#13288) 2018-03-13 15:57:34 +05:30
Ameya Shenoy
95763bc233 Purchase Order fixes (#13287)
- Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied'
- Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.
2018-03-13 15:51:56 +05:30
Nabin Hait
96f4b22589 Set po nos in DN and SI (#13290) 2018-03-13 15:46:59 +05:30
Ranjith Kurungadam
369ba85499 Physician Schedule fixes (#13284)
* move button add schedule to grid

* Physician Schedule- add slots for multiple days

* fix patient image view
2018-03-13 14:50:24 +05:30
Achilles Rasquinha
9fb7e2fe04 Merge pull request #13283 from achillesrasquinha/py3
string_types from basestirng
2018-03-12 19:16:55 +05:30
Achilles Rasquinha
cbfcb3e61d string_types from basestirng 2018-03-12 19:15:29 +05:30
Zarrar
0702f29860 Add Ends-On field in the Lead doctype (#13147)
* add ends_on date in lead to be mapped with calendar event

* set default ends_on to 1 hour from contact_time
2018-03-12 18:49:54 +05:30
tundebabzy
0125f7b130 rename to Subscription and transfer present Subscription records to Auto Repeat in frappe 2018-03-12 13:51:47 +01:00
rohitwaghchaure
13460f023d [Fix] Batch value showing as item value while making batch (#13281) 2018-03-12 17:20:50 +05:30
Nabin Hait
2f493731ec Fixed merge conflict 2018-03-12 15:49:59 +05:30
Nabin Hait
3907eae83f Merge branch 'hotfix' 2018-03-12 15:31:03 +05:30
Nabin Hait
04f50be306 bumped to version 10.1.8 2018-03-12 16:01:03 +06:00
Ameya Shenoy
b34ab7549a fixed subject to task_name (#13278) 2018-03-12 15:24:01 +05:30
Shreya Shah
aa54d934b8 make stock qty negative (#13276) 2018-03-12 15:23:28 +05:30
Zarrar
c35665fa60 update physician patch fail (#13277) 2018-03-12 15:21:53 +05:30
Nabin Hait
2c7a6e6b43 Reserve for subcontracting (#13195)
* [fix] #8427

* review comments changes

* Validation for reserved warhouse

* code improvements

* alignment

* test case

* message changes

* default warehouse / remove validation / change sql

* fix

* patch

* Fixed merge conflict

* Fixes and cleanups of reserve qty for subcontracting

* set from_warehouse only if purchase_order and purpose found (#12398)

* [HotFix] Validation issue for subcontract stock entry (#12127)

* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py

* Fixes and cleanups of reserve qty for subcontracting

* patch fixed

* Reload bin in patch

* [fix] set source warehouse in stock entry for manufacture

* [fix] #8540

* code alignment

* code alignment

* Move target warehouse validation to submit

* validation code improvement

* code changes for single stock entry

* validation fix

* call make_rm_stock_entry

* remove old stock entry method/rewrite test case

* Don't set bom_no against raw materials while trasferring items for sub-contracting

* minor fix
2018-03-12 14:12:12 +05:30
Shreya Shah
58797481f0 uncheck report hide (#13256) 2018-03-12 13:08:01 +05:30
Kenneth Sequeira
b48557fdc6 payment terms video tutorial in videos/learn (#13258)
* payment terms video tutorial in videos/learn

* Update payment-terms.md
2018-03-12 13:07:21 +05:30
Shreya Shah
ef4c3b8e2f add has variants in standard filter (#13251) 2018-03-12 11:20:49 +05:30
rohitwaghchaure
12aa4265ff Don't allow to set negative quantity if transaction is not return entry (#13255) 2018-03-12 11:20:30 +05:30
Shreya Shah
69d9f51dbb if price list not found, set default selling/ buying price list from settings (#13259) 2018-03-12 11:15:49 +05:30
Prateeksha Singh
71166d46f9 Merge pull request #13270 from pratu16x7/charts-fix
Update Charts to v1
2018-03-12 10:56:49 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
tundebabzy
2970630ed2 Merge branch 'develop' into new-subscription 2018-03-12 02:00:34 +01:00
Nabin Hait
fd75d554d2 Payment Terms Template added in test_ignore for Company 2018-03-09 18:52:14 +05:30
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Nabin Hait
3dea6589d7 Merge branch 'hotfix' 2018-03-09 16:38:51 +05:30
Nabin Hait
096d136460 bumped to version 10.1.7 2018-03-09 17:08:50 +06:00
Nabin Hait
c3889d85a1 Update shopping_cart.js 2018-03-09 16:28:25 +05:30
Achilles Rasquinha
138a4850fe Merge pull request #13252 from achillesrasquinha/py3
sort by name accounts for trial balance.
2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975 sort by name accounts 2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1 sort by name accounts 2018-03-09 15:22:20 +05:30
Nabin Hait
052333ea63 subctracting stock entry should also be considered as consumed qty 2018-03-09 14:30:32 +05:30
tundebabzy
3d26003c1f add column breaks to Subscription 2018-03-09 09:37:06 +01:00
tundebabzy
8889b70ba1 Merge branch 'develop' into new-subscription 2018-03-09 09:10:48 +01:00
Nabin Hait
0357fbc9c1 commonfied regional function for checking delete permission 2018-03-09 13:19:52 +05:30
Nabin Hait
6d532a82ee Merge branch 'theopen-institute-nepal-localization' into develop 2018-03-09 13:11:19 +05:30
Nabin Hait
096c05ca6f Fixes for regional feature of Nepal 2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352 prevent deletion of sales invoices if country is nepal 2018-03-09 12:39:40 +05:30
Achilles Rasquinha
b4de7e3d07 removed has_key, used pythonic in (#13236)
* removed has_key, used pythonic in

* Update bom.py
2018-03-09 12:35:47 +05:30
Suraj Shetty
f2d28ebd6a Data import Tool bug fix (#13165)
* fixes #13064

* commonified naming series checks

* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
tundebabzy
e69747ca6d [Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243)
* add mode of payment field to Payment Term

* add mode of payment field to Payment Terms Template Detail

* add mode of payment field to Payment Schedule

* add mode of payment in `get_payment_term_details`
2018-03-09 12:23:53 +05:30
Shreya Shah
aadd30d194 fetch delivery date on add-row only if item_code exists (#13250) 2018-03-09 12:19:35 +05:30
Zarrar
3fd634783d [Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198)
* customer code can be assigned based on customer group

* improvise customer group selection

* requested changes made
2018-03-09 12:10:45 +05:30
Harsh Patel
22e6f8d4c2 Fixes for #13071 (#13234) 2018-03-08 16:23:59 +05:30
rohitwaghchaure
acd3479269 Bank POS transactions in bank reconciliation (#13225) 2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Ranjith Kurungadam
a3a63177a1 fix- cannot cancel consultation, remove updating age (#13226) 2018-03-08 16:20:22 +05:30
Achilles Rasquinha
b2f7092f9e Merge pull request #13235 from achillesrasquinha/py3
removed has_key
2018-03-08 14:22:36 +05:30
Achilles Rasquinha
87dab14576 removed has_key 2018-03-08 14:21:48 +05:30
Achilles Rasquinha
30f6f7dd55 Merge pull request #13232 from codingCoffee/indentation_fix
indentation fix
2018-03-08 13:27:52 +05:30
Ameya Shenoy
d2eec91b2c indentation fix 2018-03-08 13:27:11 +05:30
Achilles Rasquinha
755d3782a5 Merge pull request #13230 from achillesrasquinha/develop
fixed tabs
2018-03-08 13:21:42 +05:30
Achilles Rasquinha
9efd6e80d2 fixed tabs 2018-03-08 13:20:48 +05:30
Achilles Rasquinha
ed710e2f2f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-08 13:19:31 +05:30
Achilles Rasquinha
7df344409e Merge pull request #13229 from achillesrasquinha/py3
fixed tabs
2018-03-08 13:17:19 +05:30
Achilles Rasquinha
e96a5770f2 fixed tabs 2018-03-08 13:16:29 +05:30
Achilles Rasquinha
987934d8ee fixed tabs 2018-03-08 13:16:08 +05:30
Achilles Rasquinha
abd365fd90 Merge pull request #13228 from achillesrasquinha/py3
[FIX] filter to list
2018-03-08 13:11:58 +05:30
Achilles Rasquinha
908289d40a [FIX] filter to list 2018-03-08 13:10:51 +05:30
Jamsheer
665b48773f Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211)
* New Document - Patient Service Unit

* Physician - schedule based on patient service unit

* Consultation - Remove validation on submit

* Consultation - Label changed from Drug Prescription to Medication

* Availability check and book appointment based on service unit, appointment invoice creation optimized

* patch fixes

* Patient Service Unit - field - overlap_appointments

* Patient Appointment - Service Unit based scheduling and booking

* Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment

* Codacy fixes on PR #13211

* Codacy fixes on PR #13211

* Fee validity test -fixes

* Fee Validity - test - fixes
2018-03-08 13:08:35 +05:30
Achilles Rasquinha
11241044b2 Merge pull request #13227 from achillesrasquinha/py3
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:58:21 +05:30
Achilles Rasquinha
9050998e06 [FIX] use text_type instead of unicode, use cmp from past.builtins 2018-03-08 12:55:41 +05:30
theopen-institute
1bfa243190 fix patch that causes error on bench update (#13222) 2018-03-08 11:20:40 +05:30
lasalesi
470977fa13 corrected setup wizard tax rates for Switzerland 2018 (#13220) (#13221) 2018-03-08 11:19:56 +05:30
tundebabzy
1643cce479 fetch journal entry details (#13218) 2018-03-08 11:17:17 +05:30
Manas Solanki
bb42e3b411 Merge pull request #13214 from manassolanki/assessment-report-fix
minor fix for key error in assessment reports
2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1 minor fix for key error 2018-03-07 16:28:21 +05:30
Shreya Shah
c3bf1fa009 [Fixes] Chapter DocType (#13213)
* fetch chapter head from member doctype instead of user

* add enabled in grid view and set default as 1
2018-03-07 16:27:30 +05:30
rohitwaghchaure
bbd9b71547 Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043) 2018-03-07 15:39:40 +05:30
Vishal Dhayagude
668ec25d19 Allow Item variant Rename (#13161)
* [WIP] Item varient rename

* [wip] Item Variant

* [fix] Item Varient Rename

* [fix] Item Attribution Rename

* removed unwanted code
2018-03-07 15:31:08 +05:30
Nabin Hait
c50d7446b5 Merge branch 'master' into develop 2018-03-07 13:09:07 +05:30
Nabin Hait
f0543a9765 Merge branch 'hotfix' 2018-03-07 13:09:06 +05:30
Nabin Hait
36b4faab48 bumped to version 10.1.6 2018-03-07 13:39:05 +06:00
Saurabh
2b59a851c4 Merge pull request #13166 from saurabh6790/patches_fixes
[fix] use join instead of subquery
2018-03-07 12:59:03 +05:30
Manas Solanki
857d4f7a0b Merge pull request #13209 from manassolanki/guardian-fix
allow renaming of the guardian
2018-03-07 12:53:40 +05:30
Manas Solanki
12d7bfb658 allow renaming of the guardian 2018-03-07 12:52:31 +05:30
Raghavendra Kamath
6193b92b70 Add new logo in splash image and optimise pngs (#13206) 2018-03-07 12:39:38 +05:30
Saurabh
ca6e223694 [fix] use join instead of subquery 2018-03-07 12:13:32 +05:30
rohitwaghchaure
343ba85e3a Merge pull request #13203 from saurabh6790/pe_fix
[fix] setup_party_account_field on init
2018-03-07 12:11:46 +05:30
Manas Solanki
16c324f699 Merge pull request #13207 from manassolanki/course-schedule-fix
fix the desktop icon for course schedule
2018-03-07 12:10:36 +05:30
Manas Solanki
1fa992564a fix the desktop icon for course schedule 2018-03-07 12:08:52 +05:30
Saurabh
a65b28772f [fix] setup_party_account_field on init 2018-03-06 18:22:01 +05:30
Achilles Rasquinha
78064b7a45 Update patches.txt 2018-03-05 17:53:23 +05:30
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
Nabin Hait
ba6003ece7 Merge branch 'hotfix' 2018-03-05 14:47:19 +05:30
Nabin Hait
491ce05b8d bumped to version 10.1.5 2018-03-05 15:17:18 +06:00
Saurabh
2cfcbf933d Patches fixes (#13163)
* [fix] if serialised items not found then return

* [fix] unicode encoding in patch
2018-03-05 13:01:15 +05:30
Zarrar
2550180a05 remove updating territory for customers on change (#13162) 2018-03-05 12:32:41 +05:30
Zarrar
950fff0ba1 changes according to the workflow (#13160) 2018-03-05 11:30:53 +05:30
Manas Solanki
5fd7b3bb80 Fix status updater (#13033)
* fix the status updater for multiple sources

* patch for updating the status

* patch for updating the sales order item

* Update update_status_for_multiple_source_in_po.py
2018-03-05 11:28:29 +05:30
Vishal Dhayagude
35b665cb26 [new] Create multiple warehouse address and fetch address to stock entry (#13109)
* [new] Create multiple warehouse address and fetch address to stock entry

* [fix] Deleted unwanted field and added patch to link warehouse details to Address

* [fix] Codacy fixed

* [fix] Modified patch for warehouse address

* [fix] Modified patch for warehouse address

* [fix] Patch updated and removed contact details from stock entry

* [fix] Patch Updated
2018-03-05 11:10:01 +05:30
Zarrar
4417cb0006 improve multiple add dialog, populate parent's depends on with child tasks (#13142) 2018-03-05 11:08:15 +05:30
Kenneth Sequeira
89795c3f69 Doc imp (#13148)
* added intro, item and prices video, fixed image links in item and prices

* update 2: first 5 videos added

* added all videos to the user manual

* updated .gitignore
2018-03-05 11:06:44 +05:30
Zarrar
1e4e004667 leave application assigned by naming_series (#13158) 2018-03-05 11:05:59 +05:30
rohitwaghchaure
a6a4e86dc8 [Fix] System only shows 20 attribute values while making variants (#13155) 2018-03-05 11:03:59 +05:30
rohitwaghchaure
0eb8bb2511 [Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152) 2018-03-05 11:03:27 +05:30
rohitwaghchaure
67cfa81de2 [Fix] Stock Ageing report does not work with group warehouse (#13151) 2018-03-05 11:00:42 +05:30
tundebabzy
458a1fe61a codacy 2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00 codacy 2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47 codacy tinzz 2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68 codacy tinzz 2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9 more tests and bug fixes 2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7 fix proration logic to reduce possibility of rounding errors 2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5 enhancement: do nothing if cancel_sbscription is called for cancelled subscription 2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e enhancement: ensure subscription is cancelled before attempting to restart 2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343 codacy review 2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572 Merge branch 'develop' into new-subscription 2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d clean up 2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4 more tests 2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205 prorate invoice when cancelling subscription 2018-03-02 10:16:42 +01:00
tundebabzy
4499e5351c add article 2018-03-02 06:51:33 +01:00
tundebabzy
16afa8765e tiny refactor of invoice setting logic 2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43 fix: apply_discount_on field should be of type Select not Data 2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827 make sure default apply_discount_on is set when creating invoice 2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99 fix: task should explicitly call commit and rollback if error 2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e docstrings 2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c hook to hourly scheduler 2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a fix test 2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494 update tests and more tweaks 2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1 update start date alone after restarting subscription 2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383 set initial invoice period based on subscription start 2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce freeze screen while waiting for updates on subscription 2018-03-01 08:45:56 +01:00
rohitwaghchaure
a942722619 [Fix] Timeout issue while saving multilevel BOM (#13118) 2018-03-01 13:15:25 +05:30
tundebabzy
328adedbc8 adds start field to record subscrption start date 2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7 Editable unallocated amount in pe (#13130)
* editable unallocated amount in payment entry to handle multi currency

* set unallocated amount on server side

* some minor fixes

* Fixes in territory patch

* removed print

* minor fixes
2018-03-01 13:14:14 +05:30
rohitwaghchaure
4badb45ee5 Merge pull request #13139 from rohitwaghchaure/sales_invoice_email_propmt_issue
[Fix] Sales invoice email prompt not working
2018-03-01 13:07:31 +05:30
Rohit Waghchaure
855d843e55 [Fix] Sales invoice email prompt not working 2018-03-01 13:06:01 +05:30
Harsh Patel
5bebbbe7a9 [Feature] Supplier warehouse link field on purchase order (#13051)
* Multiple Features:
[New] Supplier warehouse link field on purchase order for sub-contracting
[New] Auto select supplier warehouse while making purchase receipt from purchase order

* Set default to_warehouse in stock entry as the supplier warehouse
2018-03-01 11:33:25 +05:30
rohitwaghchaure
0df95fa781 Multi-UOM for sales/purchase return (#13132)
* Multi-UOM for sales/purchase return

* Update sales_and_purchase_return.py
2018-03-01 11:31:33 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008)
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Zarrar
6578bc11b6 wrong query formed to delete events (#13119) 2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078 Set auto created serial nos in incoming transactions in case of multi UOM (#13112)
* Create user from Employee

* Set auto created serial nos in incoming transactions in case of multi uom
2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5 Make Expense Claim from Employee Advance #13053 (#13074)
* allow to make expense claim from employee advance

* make expense claim only if claimed amount < paid_amount

* expense claim made from employee advance is paid
2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67 display image fnd description for root BOM also (#13099) 2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8 Do not validate payment schedule for POS (#13115) 2018-03-01 10:32:29 +05:30
Nabin Hait
a645f36b2b Get valuation rate from historical SLE even if it is zero (#13129)
* Don't overwrite start and end date comes from payroll entry

* Get valuation rate from historical SLE even if it is zero, if records exists

* Valid till should be autoset if not any default value

* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
rohitwaghchaure
332a17ee86 [Fix] Test case for serial no (#13136) 2018-03-01 10:28:04 +05:30
tundebabzy
d9fec69a70 update test case, fix bugs 2018-03-01 05:34:02 +01:00
tundebabzy
8f37926ca8 add ability to cancel, restart and refresh subscription 2018-03-01 04:57:23 +01:00
Achilles Rasquinha
45522327b9 Merge pull request #13137 from achillesrasquinha/py3
Fix unittest
2018-02-28 22:01:35 +05:30
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
Shreya Shah
a310cc7156 order by modified instead of item name (#13113) 2018-02-28 18:59:55 +05:30
Ameya Shenoy
c20901443e updated develop_version to 11 (#13133) 2018-02-28 17:38:23 +05:30
tundebabzy
2cccad0274 more tests and quick fix 2018-02-28 12:45:09 +01:00
tundebabzy
a5bc057ad4 adds missing 'translatability' 2018-02-28 12:24:16 +01:00
tundebabzy
86ee455cbc more tests and bug fix 2018-02-28 12:21:08 +01:00
tundebabzy
b3d5777e55 more test cases and bug fixes 2018-02-28 12:11:19 +01:00
Achilles Rasquinha
96698c9a77 Use range instead xrange (#13128)
* Use range instead of xrange

* convert float to int
2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d python 3 fix (#13127) 2018-02-28 12:53:34 +05:30
tundebabzy
3aaf693abd adds task -process 2018-02-28 05:12:18 +01:00
tundebabzy
95a4ca9429 update test cases 2018-02-27 18:09:06 +01:00
tundebabzy
9bf029a16e generate new invoice only when current_invoice_end is past 2018-02-27 15:19:02 +01:00
Achilles Rasquinha
11a5f78d3e Merge pull request #13070 from achillesrasquinha/py3
[FIX] sorting multiple compares
2018-02-27 19:48:25 +05:30
tundebabzy
45b6a1719f refactor:
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
2018-02-27 15:14:19 +01:00
tundebabzy
c634ca8737 adds validation to billing_interval_count in Subscription Plan 2018-02-27 14:12:39 +01:00
Nabin Hait
3b43c0d160 Update territory and customer_group patch optimization (#13076)
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
2018-02-27 15:57:14 +05:30
Zarrar
96002c28bd optimize patch for faster execution (#13068) 2018-02-27 15:57:01 +05:30
Zarrar
91fc1a8fbe Update Territory & Customer Group across all transaction (#13004)
* added method for update query based on changes

* patch added

* updated function, moved util function
2018-02-27 15:56:38 +05:30
tundebabzy
3c26a7e862 adjusts query so multiple plans can be used to create single invoice 2018-02-27 09:36:29 +01:00
tundebabzy
559d01e176 allows to rename subscription plan 2018-02-27 09:13:35 +01:00
tundebabzy
07313c281a adds more assertions to test cases 2018-02-27 09:00:13 +01:00
Ameya Shenoy
3ee22f0137 rename valid_email to validate_email (#13103) 2018-02-27 12:59:12 +05:30
rohitwaghchaure
f1755fb5b1 Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1
[Hotfix] POS discount issue
2018-02-27 11:58:33 +05:30
Manas Solanki
be841ccc53 Merge pull request #13096 from manassolanki/fix-fee-schedule
Fixes in the Fees Schedule
2018-02-27 11:23:38 +05:30
Frappe PR Bot
c6e2d750bb [Translation] Updated Translations (#13097) 2018-02-27 11:00:59 +05:30
Zarrar
033eb779d4 minor fixes for member (#13101) 2018-02-27 11:00:47 +05:30
tundebabzy
048bcbf080 more tests and code fixes 2018-02-26 22:17:06 +01:00
tundebabzy
b84e9519c2 Subscriptions doctype - subscriber should be set only once 2018-02-26 20:35:20 +01:00
tundebabzy
1ea5055967 fix another date comparison bug 2018-02-26 20:17:59 +01:00
tundebabzy
4d8175f9d9 adds test cases and fix resulting bugs 2018-02-26 18:56:05 +01:00
tundebabzy
cd700efc0b only generate invoice after_insert if subscription is not in trial period 2018-02-26 16:26:36 +01:00
tundebabzy
0091c86e80 fix date comparison bug 2018-02-26 16:18:55 +01:00
tundebabzy
08a11b4d1f sets default for days_until_due to 0 2018-02-26 16:13:45 +01:00
tundebabzy
d3fdcd9da5 set after_insert methods:
- if subscription is not in trial period, generate sales invoice
2018-02-26 16:10:47 +01:00
tundebabzy
b72aac6729 adds validation:
- ensure trial period dates are in order
2018-02-26 15:56:47 +01:00
tundebabzy
7a2c6df645 sets Subscription doc status in before_save 2018-02-26 15:55:32 +01:00
tundebabzy
3010996cc5 adds before_insert methods:
- set current_invoice_start
- set current_invoice_end
2018-02-26 15:51:32 +01:00
tundebabzy
35e92c7d29 removes start field from Subscriptions 2018-02-26 15:25:26 +01:00
Manas Solanki
51dfba749b filter students on basis of category and button to show fees 2018-02-26 19:32:26 +05:30
tundebabzy
6e014331c5 removes end_date from Subscriptions doctype 2018-02-26 14:05:54 +01:00
tundebabzy
2b5298238e adds prorate field to Subscription Settings 2018-02-26 13:58:29 +01:00
tundebabzy
2dee342501 Subscriptions doctype - trial start and end are set_only_once 2018-02-26 13:34:25 +01:00
Nabin Hait
3799f8bec9 Don't validate serial nos while cancelling the transaction 2018-02-26 16:39:06 +05:30
Zarrar
e53a238665 minor fix (#13095) 2018-02-26 15:59:20 +05:30
Shreya Shah
70a57e08fd New Report Employee Advance Summary (#13040)
* New Report Employee Advance Summary

* JSON style column definition
2018-02-26 15:58:57 +05:30
tundebabzy
cbe4f5b6b3 changes to subscription settings 2018-02-26 11:22:53 +01:00
tundebabzy
066958a794 subscription_invoice doctype changes 2018-02-26 11:22:05 +01:00
Rohit Waghchaure
3edc101957 [Fix] POS discount issue 2018-02-26 13:25:58 +05:30
tundebabzy
8457bb2c7e change in Subscription Settings 2018-02-26 08:13:41 +01:00
Nabin Hait
127c61e930 Fixed logic in itemwise recommended reorder level 2018-02-26 12:43:17 +05:30
rohitwaghchaure
8ffd5d40e3 [Fix] UX for delivery trip (#13046)
* [Fix] UX for delivery trip

* Fixed test cases
2018-02-26 12:25:39 +05:30
tundebabzy
9360f81b94 Validity of Quotation #12858 (#13078)
* add new setting for default valid_till date

* codacy cleanup
2018-02-26 12:23:41 +05:30
Nabin Hait
e55831a89c Projected Qty in Auto reorder email 2018-02-26 11:38:40 +05:30
tundebabzy
9016890ecf adds Subscription Settings doctype 2018-02-26 06:15:31 +01:00
tundebabzy
988f5ca38b hide trial_period_end and invoices if empty 2018-02-26 05:14:10 +01:00
tundebabzy
bbac07d9d2 use naming series for Subscriptions 2018-02-26 05:07:56 +01:00
tundebabzy
dda6234cab remove subscription name and name by subscriber 2018-02-26 04:52:13 +01:00
tundebabzy
7c455ad4b6 display invoices section field only if there are invoices 2018-02-26 04:50:45 +01:00
tundebabzy
4ca5e81aa3 adds description for billing_interval_count in subscription plan 2018-02-26 04:47:19 +01:00
tundebabzy
4d31255d5c customer field in Subscriber should be Link 2018-02-26 04:40:53 +01:00
tundebabzy
a07811b67f adds new doctype - Subscriptions
- encapsulates subscription
- linked to a subscriber
- subscription can contain many plans
- contains history of generated invoices
2018-02-26 04:25:30 +01:00
Nabin Hait
2572b05b35 Update territory and customer_group patch optimization (#13076)
* Update territory and customer_group patch optimization

* Update update_territory_and_customer_group.py
2018-02-25 10:45:24 +05:30
tundebabzy
2581e2e5d7 New doctype - Subscription Plan:
- Plan is to be linked to a Product
- Plan will be used to create Invoice items
- Subscriber can have multiple plans
- Contains billing cycle information
2018-02-24 11:31:42 +01:00
tundebabzy
007919c03f New doctype - Subscriber:
- Encapsulates a subscriber to a service or product
- Contains subscription specific information
2018-02-24 11:19:06 +01:00
Zarrar
4a0d27078e optimize patch for faster execution (#13068) 2018-02-23 17:41:32 +05:30
Achilles Rasquinha
a3555aa7bd [FIX] sorting multiple compares 2018-02-23 17:22:07 +05:30
Nabin Hait
802819df9d Merge branch 'master' into develop 2018-02-23 16:59:44 +05:30
Nabin Hait
4ff4d185f7 Merge branch 'hotfix' 2018-02-23 16:59:42 +05:30
Nabin Hait
d54953e419 bumped to version 10.1.4 2018-02-23 17:29:42 +06:00
Zarrar
339426c926 fix permission issue for stock balance report - Item Group (#13069) 2018-02-23 16:58:55 +05:30
Nabin Hait
7570774ebe Merge branch 'master' into develop 2018-02-23 16:49:43 +05:30
Nabin Hait
489ff6e21c Merge branch 'hotfix' 2018-02-23 16:49:41 +05:30
Nabin Hait
d12fb58c12 bumped to version 10.1.3 2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce verify payment entry amount is positive (#13066)
* verify payment entry amount is positive

* Update sales_invoice.py

* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb [Fix] Item wise sales register report (#13055) 2018-02-23 16:25:30 +05:30
Shreya Shah
70a68897cc auto name on the basis of naming series (#13056) 2018-02-23 16:24:59 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
Frappe PR Bot
239c121f7d [Translation] Updated Translations (#13059) 2018-02-23 16:23:00 +05:30
rohitwaghchaure
dd0fc1084e [Fix] PDC amount, PDC print layout issue (#13062) 2018-02-23 16:20:46 +05:30
Faris Ansari
97b212e348 Patch optimization (#13060)
* Patch fixes

* fix codacy

* Update item_barcode_childtable_migrate.py
2018-02-23 16:19:41 +05:30
Raghavendra Kamath
1a9388acbb Clean inline css found in chapter and grant for loops! (#13038)
* Clean inline css found in chapter and grant for loops!

* Remove redundant css

* remove unwanted ide files and append gitignore

* remove unnecessary line from build.json

* restore import for variable.less

* remove kdev from gitignore
2018-02-23 14:34:44 +05:30
Nabin Hait
d283ee73f3 Fetch timesheet based on project 2018-02-23 12:58:39 +05:30
Nabin Hait
5b9f3b0cd3 Merge branch 'master' into develop 2018-02-22 18:18:36 +05:30
Nabin Hait
93f138eece Merge branch 'hotfix' 2018-02-22 18:18:34 +05:30
Nabin Hait
2b2cf13408 bumped to version 10.1.2 2018-02-22 18:48:34 +06:00
Nabin Hait
7f49b57aaa Update added_extra_gst_custom_field_in_gstr2.py 2018-02-22 18:17:57 +05:30
Nabin Hait
0e3db275e5 Merge branch 'master' into develop 2018-02-22 18:10:39 +05:30
Nabin Hait
00330f52bd Merge branch 'hotfix' 2018-02-22 18:10:37 +05:30
Nabin Hait
6b69fc7e5d bumped to version 10.1.1 2018-02-22 18:40:37 +06:00
Saurabh
d8cd54dfd0 [fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047) 2018-02-22 18:05:40 +05:30
Suraj Shetty
8a41887f68 patch exception fixes (#13037)
* patch exception fixes

* reload daily_work_summary_group_user doctype
2018-02-22 15:56:33 +05:30
tundebabzy
2949e9c5dc Merge pull request #13036 from tundebabzy/issue-13019
Uncaught Server Exception : adjust_qty_for_expired_items #13019
2018-02-22 11:04:53 +01:00
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
Nabin Hait
15bd3167a8 Merge branch 'hotfix' 2018-02-22 14:39:37 +05:30
Nabin Hait
9b530fb2cb bumped to version 10.1.0 2018-02-22 15:09:37 +06:00
Nabin Hait
06bace9089 Fixed develop version 2018-02-22 14:36:26 +05:30
tundebabzy
c15978fca0 fix indentation 2018-02-22 09:50:49 +01:00
Nabin Hait
cb2264e0b4 Merge branch 'vishdha-leaderboard' into hotfix 2018-02-22 14:00:04 +05:30
Nabin Hait
7d862276af Cleanup and fixes on leaderboard 2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603 Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard 2018-02-22 11:35:10 +05:30
rohitwaghchaure
23a2b65576 [Fix] BOM Update Tool not update grandparent's exploded BOM (#13026) 2018-02-22 11:32:09 +05:30
tundebabzy
cad22dbe39 Cutomisable Cash Flow Reports (#12969)
* add child doctype - Cash Flow Mapping Account

* adds new doctype - Cash Flow Mapping

* adds new doctype - Cash Flow Mapper

* adds new doctype Cash Flow Mapping Template

* adds new doctype Cash Flow Mapping Template

* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper

* get cash_flow_accouts from Cash Flow Mapping

* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field

* changes description from 'Net Profit/Loss' to 'Profit for the year'

* set `net_profit_loss` `parent_account` properly

* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`

* remove zero rows

* de-duplicates row, summing similar accounts in the process

* makes gl sum calculation use `parent_account` as a condition

* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field

* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities

* add "Movement in working capital" subheader

* refactor code for readability

* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'

* allow `Cash Flow Mapping` to be renamable

* adds new field - `section_subtotal` useful for only Operating Activities

* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L

* calculates and shows tax paid adjustment in cash flow statement

* renames `is_interest_paid` to `is_finance_cost`

* - adds finance costs calculation
- correctly sets opening balance dates

* prevents users from selecting extra options in Cash Flow Mapping

* adds validation to prevent selecting multiple options

* adds new fields to Cash Flow Mapping

* calculate non cash p or l items (2nd pass)

* separates default cash flow generation from custom

* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report

* clean up

* removes mandatory constraint from accounts field

* allow rename, disallow create and delete

* adds patch to add default Cash Flow Mappers

* refactors custom_cashflow

* add article to explain configuration

* refactor

* further refactor

* final clean up (hopefully)

* clean up for codacy

* more codacy fixes

* more codacy fixes

* fix broken patch

* rename article to .md

* create default mappers after install

* PEP 8

* create the tables in `after_install` call
2018-02-22 11:08:36 +05:30
tundebabzy
27d558c9ef Optionally allow overlap on Timesheet #12893 (#13018)
* give user option to ignore time overlap validation

* move settings to new Projects Settings

* clean up - remove trailing space
2018-02-22 11:05:49 +05:30
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988)
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
2018-02-22 11:03:48 +05:30
Zarrar
79756c44c9 Update Territory & Customer Group across all transaction (#13004)
* added method for update query based on changes

* patch added

* updated function, moved util function
2018-02-22 10:57:49 +05:30
Shreya Shah
0bde9e11c7 clear log if no attachments (#13023) 2018-02-22 10:55:40 +05:30
tundebabzy
637b242a34 Credit card default account should be debtors #12989 (#13029)
* allow receivable account type in mode of payment

* update `default_account` field description
2018-02-22 10:51:57 +05:30
vishdha
09d56754ea [fix] Codacy issue 2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19 [fix] Sales partner details get from sales Order and company currency details from selected company 2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e [fix] Codacy Issue 2018-02-21 15:35:58 +05:30
vishdha
d4491d361f [new] Filter based on company: 2018-02-21 15:35:58 +05:30
vishdha
09acb779d7 [new] Leader board 2018-02-21 15:35:58 +05:30
Suraj Shetty
d3069fee4d Daily work summary refactor (#12944)
* added daily work summary setting doctype and code to support feature

this will allow multiple setting for daily work summary

* added daily work summary setting user doctype

* made changes in daily work summary code

* [minor] entry change in hr config file

* deleted previous daily work summary settings (and its company) doctype

* removed unwanted permission check

* toggled read_only option for enabled field

* removed print statements

* add patch for the changes

* doc changes

* [minor] indentation fix

* fixed tests

* indentation fixes

* codacy issue fix

* formatting fixes

* renamed doctype

Renamed Daily Work Summary Setting to  Daily Work Summary Group and did related code and doc changes

* fixed typo

* updated doc

* codacy issue fix

* [minor] renamed doctype name in json

* Renamed old doctype

* fixed indentation

* codacy fix

* indentation fix

* renamed doctype

* handled patch exception

* fixed exception

* Update daily_work_summary_group.py

* rename patch file

removed abbreviation in file name

* handled exception in patch code

* removed Unnecessary pass statement

* [minor] indentation fix
2018-02-21 15:15:43 +05:30
Zarrar
67f74414c4 disable expand_all button for BOM (#13015) 2018-02-21 14:46:41 +05:30
Shreya Shah
8a77a0e1e4 Add total row in all trends reports (#13010)
* total in sales order trends report

* total in all trends reports
2018-02-21 14:46:07 +05:30
Zarrar
bc5515651b [Hotfix] Selecting create on blank field throws error (#13014)
* selecting create on blank field error fix

* error when fetching default_print_format
2018-02-21 11:13:14 +05:30
Shreya Shah
f65afac353 db_update instead of save to avoid unnecessary validations (#13009) 2018-02-21 11:12:04 +05:30
Charles-Henri Decultot
b8c088edb7 Transaction Log for France (#12795)
* Regional overrides for France

* Addition of tests and documentation
2018-02-21 11:07:33 +05:30
Faris Ansari
7c744acc49 Changes for Rollup (#12924)
* Changes for rollup

* remove variables.less
2018-02-20 14:21:50 +05:30
rohitwaghchaure
e2558308f6 [enhance] Production Plan (#12160)
* [enhance] Production plan

* Test cases

* Removed production planning tool

* Documentation

* Added actual qty in material request production item

* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
2018-02-20 12:20:00 +05:30
Pawan Mehta
2fbb4923a7 item balance report (#12983)
* item balance report

* remove hard coding

* Update item_balance.json

* Update item_balance.json

Change name to "Item Balance (Simple)"

* Update item_balance.json
2018-02-20 12:17:49 +05:30
Pawan Mehta
244e235c48 Sales Payment Summary - fix for change amount (#12981)
* [fix] #12980

* apply change amount to cash
2018-02-20 12:15:10 +05:30
Shreya Shah
f718b0c0df Currency filter in Pricing Rule (#11776)
* added currency filter

* modified files

* pull margin only if currency matches

* Renamed price to rate in pricing rule

* fetch rate only if currency matches

* rebase with develop

* rebase with develop

* patch to set currency in existing docs

* currency field mandatory in pricing rule

* modified test cases

* rebase with develop

* fixed test case
2018-02-20 11:26:46 +05:30
rohitwaghchaure
554f2de23d Code cleanup online POS (#12985) 2018-02-20 11:18:01 +05:30
Vishal Dhayagude
a5003f8f5b [minor] Balance Qty added in reorder level email notification (#13000) 2018-02-20 11:14:54 +05:30
tundebabzy
6c5d7986ab Outstanding Amount not getting updated in Payment Entry #12713 (#12975)
* allow to `set_missing_ref_details` by force

* update payment entry references during submit and cancel
2018-02-19 13:11:56 +05:30
Shreya Shah
5448318146 fix total field (#12992) 2018-02-19 12:44:52 +05:30
Pawan Mehta
174a18399c Added Payment Details to Sales Payment Summary Report (#12358)
* [fix] #12357

* label changes
2018-02-19 12:39:13 +05:30
Saurabh
ec23a6f0eb [fix] section break for raw_material_details (#12976) 2018-02-19 11:33:11 +05:30
Achilles Rasquinha
9b74f8bd37 Update requirements.txt 2018-02-16 17:49:55 +05:30
joezsweet
16862f9051 Better handling of auto set barcode_type issue (#12970)
Get barcode_type options and check if value is included
2018-02-16 17:33:30 +05:30
Charles-Henri Decultot
894ab7a664 Braintree integration documentation (#12775)
* Braintree integration documentation

* Cleanup documentation
2018-02-16 15:16:47 +05:30
riyasrawther
d1134516c2 Warehouse wise Item Balance, Age and Value (#12879)
* Create warehouse_wise_item_balanace_age_and_value.py

* Create warehouse_wise_item_balance_age_and_value.js

* Create warehouse_wise_item_balance_age_and_value.json

* Update warehouse_wise_item_balance_age_and_value.json

* Update warehouse_wise_item_balance_age_and_value.json

* Update warehouse_wise_item_balance_age_and_value.json

* Update warehouse_wise_item_balance_age_and_value.js

* Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py

* Update warehouse_wise_item_balance_age_and_value.py
2018-02-16 14:53:53 +05:30
Shreya Shah
093e7e6e98 Refactor Expense Claim (#12883)
* patch for custom workflow

* deleted field approval_status

* replaced approval_status with workflow_state

* updated test cases

* validation to check expense approver

* check if workflow_state_name already exists

* fixes

* modified notifications.py

* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
joezsweet
bd7c00c59e [Hot Fix] barcode_type auto set to a wrong value (#12957)
* Fix barcode_type auto set to a wrong value

This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13"

* codacy fix
2018-02-16 14:47:10 +05:30
Jay Parikh
33b2614377 [Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966) 2018-02-16 14:45:40 +05:30
Zarrar
441a1e1b8a Validate Bank name in Setup wizard on the same slide (#12968)
* validate bank name before moving on to next slide

* Update setup_wizard.js
2018-02-16 14:44:42 +05:30
Nabin Hait
b95ecd7fcd Gstr reports (#12940)
* GSTR1 for B2B (#12296)

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426)

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings

* Update gstr_1.py

* GSTR1 for B2B, B2CL and B2CS (#12459)

* [Report] GSTR - 1 CDNR Report (#12554)

* [wip] cdnr

* [WIP] cdnr with optional data

* [wip] Export GSTR-1

* [minor] Minor changes in export

* [new] Custom field added for GST

* [fix] Minor changes in GSTR1 Report

* [minor] Minor changes in gstr1

* [fix] Codacy Fixed

* Update setup.py

* [wip] Gstr2

* [fix] Fetch correct Tax Details

* [minor] ITC data append to row

* [fix] CDNR negative value

* Cleanup and fixes on GSTR-2

* Minor fixes in gstr reports (#12848)

* [new] B2C limit fetch from GST Settings (#12905)

* [new] b2c limit fetch from gst setting

* [fix] Patch Added for b2c limit

* Update gstr_1.py

* Update utils.py

* Cusotm fields related GSTR2

* minor fixes

* minor fixes

* some more fixes

* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
cc98d40ff7 Payment reco auto allocation and maintain same order of records (#12963)
* Automatically allocate amount after selecting invoice against a payment entry

* codacy fixes
2018-02-16 13:14:20 +05:30
Vishal Dhayagude
1e0ae07bff [fix] Validate Party in not present in Party Type (#12910)
* [fix] Validate Party in not present in Party Type

* [fix] Minor Changes

* [fix] Valid Customer and Supplier fetch

* [WIP] Allow and prevent for creating party

* [fix] minor changes

* [fix] Requested Changes

* [fix] Codacy issue

* Update opening_invoice_creation_tool.py
2018-02-16 13:13:37 +05:30
Shreya Shah
3a9eec2e92 Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913)
* pass bill_date as parameter and calculate due_date on that basis

* calculate payment_schedule on the basis of bill_date if present else posting_date

* add bill_date as an argument to get_party_details

* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
Shreya Shah
278af1befb remove deprecated processing payroll video links (#12947) 2018-02-16 12:58:04 +05:30
rohitwaghchaure
103c4e9b92 [Fix] Incorrect rate in item-wise sales register (#12943) 2018-02-16 12:57:35 +05:30
Shreya Shah
f4b271a02e Customer and Supplier link fields in Member DocType (#12942)
* added link fields customer and supplier

* fixed a typo
2018-02-16 12:56:01 +05:30
Zarrar
5a947f38ab avoid overlap with dropdown (#12941) 2018-02-16 12:49:30 +05:30
Prateeksha Singh
0acb63a938 Update hub domain 💥 2018-02-16 11:07:12 +05:30
Shreya Shah
394b7a2fa3 Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
rohitwaghchaure
5a5f73e46a Merge pull request #12602 from PawanMeh/fixes_8540
Select multiple raw material items for Sub Contract Stock Entries
2018-02-15 18:54:29 +05:30
Nabin Hait
8a562266ad Update set_b2c_limit.py 2018-02-15 18:40:18 +05:30
Nabin Hait
0c7ce02e54 Update set_b2c_limit.py 2018-02-15 18:12:27 +05:30
Nabin Hait
44658d44c5 Update gstr_1.py 2018-02-15 17:24:15 +05:30
saurabh-bhosale
307063e64e [Fix] Invalid Syntax in gstr_1.py (#12946)
* [Fix] Added missing parenthesis in gstr_1.py

* Minor change
2018-02-15 17:13:35 +05:30
Saurabh
82ffdd7dc6 Merge branch 'master' into develop 2018-02-15 15:17:04 +05:30
Saurabh
db6f0848e3 Merge branch 'hotfix' 2018-02-15 15:17:03 +05:30
Saurabh
ca166eaae5 bumped to version 10.0.23 2018-02-15 15:47:03 +06:00
Vishal Dhayagude
bd59a53173 [new] B2C limit fetch from GST Settings (#12905)
* [new] b2c limit fetch from gst setting

* [fix] Patch Added for b2c limit

* Update gstr_1.py
2018-02-15 14:22:11 +05:30
Achilles Rasquinha
0bf19a1ac5 Merge pull request #12931 from achillesrasquinha/py3-iteritems
Py3 iteritems
2018-02-15 13:49:43 +05:30
Achilles Rasquinha
c94df80d88 Merge pull request #12925 from netchampfaris/enable-translatable-patch
Patch to enable translatable
2018-02-15 12:18:26 +05:30
Achilles Rasquinha
d56b00f5fd Merge pull request #12932 from achillesrasquinha/py3-basestring
Py3 basestring
2018-02-15 12:16:12 +05:30
Achilles Rasquinha
dd8e1ff5ba Merge pull request #12930 from achillesrasquinha/py3-fixes
Py3 fixes
2018-02-15 12:15:56 +05:30
Achilles Rasquinha
5f0c70361a iteritems 2018-02-15 11:55:45 +05:30
Achilles Rasquinha
1697a7aa81 replaced string_types with basestring 2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb Updated Python 3 fixes 2018-02-15 11:31:05 +05:30
Shreya Shah
8b531c1ee6 Fix parenthesis in buying controller (#12923) 2018-02-15 11:21:49 +05:30
Prateeksha Singh
387a242232 Merge pull request #12928 from pratu16x7/hub-pages
Hub pages
2018-02-15 11:05:22 +05:30
Prateeksha Singh
9889899603 [hub] cleanups 2018-02-15 10:54:23 +05:30
Prateeksha Singh
1ad072f2a9 [hub] cleanups 2018-02-15 10:47:59 +05:30
Prateeksha Singh
2073959bb8 Update entity properties 2018-02-15 10:24:16 +05:30
Prateeksha Singh
6ee035ba5b tree parent working 2018-02-15 08:50:31 +05:30
Faris Ansari
1e422f2383 Patch to enable translatable 2018-02-14 22:18:55 +05:30
Prateeksha Singh
25d5a1d890 add company pages 2018-02-14 19:53:18 +05:30
Achilles Rasquinha
806a18b511 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-02-14 19:40:43 +05:30
Nabin Hait
e6d65bc2a1 Fixed translations and tests (#12900)
* Fixed translations and tests

* minor fixes

* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
361366ebe6 Python 3 fixes. (#12916)
* Fixed iteritems and exceptions

* python3-fixes

* fixed iteritems
2018-02-14 17:08:59 +05:30
rohitwaghchaure
a13b177908 [Fix] Not able to select delivery note in delivery trip (#12912) 2018-02-14 17:06:21 +05:30
Prateeksha Singh
8e84fa9f9e Merge pull request #12914 from achillesrasquinha/company-logo
Added Company Logo to DocType
2018-02-14 17:04:47 +05:30
Achilles Rasquinha
4b847f7897 fixed iteritems 2018-02-14 16:44:58 +05:30
Achilles Rasquinha
c67b1258dd python3-fixes 2018-02-14 16:14:52 +05:30
Achilles Rasquinha
b723033213 python3-fixes 2018-02-14 16:13:37 +05:30
Achilles Rasquinha
1c86d18837 Added Hub Company Logo 2018-02-14 16:05:32 +05:30
PrakashH
908af53fcd Update stock-reconciliation-for-non-serialized-item.md (#12908) 2018-02-14 13:16:25 +05:30
PrakashH
0c4c2981c8 Update journal-entry.md (#12909) 2018-02-14 13:15:53 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
Saurabh
0500ce445f Merge branch 'hotfix' 2018-02-14 11:45:31 +05:30
Saurabh
351dc08576 bumped to version 10.0.22 2018-02-14 12:15:31 +06:00
Achilles Rasquinha
5cf536b39d Fixed iteritems and exceptions 2018-02-13 19:05:54 +05:30
Manas Solanki
ab70b53948 Delete .swp (#12894)
* Delete .swp

* updated gitignore to exclude temp vim files
2018-02-13 18:27:02 +05:30
rohitwaghchaure
8e675ebbe2 [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) 2018-02-13 17:11:06 +05:30
Faris Ansari
d53b149828 [deadlock fix] Save if not set (#12896) 2018-02-13 16:31:00 +05:30
Faris Ansari
5a91989665 Remove total_projected_qty (#12889) 2018-02-13 16:00:52 +05:30
Nabin Hait
bb821ec2af Fixed test dependencies 2018-02-13 14:49:09 +05:30
rohitwaghchaure
62d6593fe7 [Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882) 2018-02-13 14:43:37 +05:30
Achilles Rasquinha
56b2e12af8 Python 3 fixes [merge asap] (#12884)
* Python 3 fixes

* fixed compare
2018-02-13 14:42:40 +05:30
saurabh-bhosale
ed35a296ab closes #12872 (#12888) 2018-02-13 14:40:59 +05:30
Prateeksha Singh
ecc6f86c7c Merge pull request #12885 from netchampfaris/setup-progress-deadlock-fix
[deadlock fix] Save if not set
2018-02-13 13:16:37 +05:30
Faris Ansari
f0056f7338 [deadlock fix] Save if not set 2018-02-13 12:18:24 +05:30
saurabh-bhosale
99eb30242d [Fix] Bug fix in customer_primary_address frappe call (#12880) 2018-02-13 07:58:47 +05:30
pawan
471a018e67 remove old stock entry method/rewrite test case 2018-02-12 21:15:46 +05:30
Nabin Hait
b005950ba7 Merge branch 'mntechnique-show_address_in_online_pos' into develop 2018-02-12 19:25:27 +05:30
Nabin Hait
662b23ce57 get address display in customer 2018-02-12 19:25:00 +05:30
Nabin Hait
4adcced9ae Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos 2018-02-12 19:14:38 +05:30
rohitwaghchaure
6a7495dbc8 Removed set only once for maintain stock field in item master (#12878) 2018-02-12 17:25:24 +05:30
sivankar
a4ff220769 removed duplicate function and other CLI fixes (#12876)
* merge shelf like and manufacturing date

* setting default manufacturing date as todays date

* setting default manufacturing date as todays date

* fix

* Improvements to batch auto naming (#12496)

* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test

* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set

* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'

* added manufacturing date wise sort

* added prefix to expiry date and manufacturing date

* Quality Review fixes
2018-02-12 17:24:26 +05:30
pawan
1b8c13b175 call make_rm_stock_entry 2018-02-12 16:59:59 +05:30
Nabin Hait
a8d10b7332 Update setup.py 2018-02-12 16:54:13 +05:30
Shreya Shah
d9a585bdad Leave workflow patch fixes (#12823)
* modified patch for leave application workflow

* removed leave approval field from leave application doctype

* fetch lwp and attendance only if workflow field exists

* modified test cases

* modified files with leave application

* docstatus draft for rejected applications

* modified leave application calendar

* test fixed

* run patch only if any record exists
2018-02-12 16:02:57 +05:30
Nabin Hait
c69f4c0c79 Merge branch 'joezsweet-multi-barcode' into develop 2018-02-12 16:00:56 +05:30
Nabin Hait
e21e59614f Fixed merge conflict 2018-02-12 15:59:55 +05:30
tundebabzy
6e90f49a35 Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714)
* unconditionally fetch exchange rate

* Revert "unconditionally fetch exchange rate"

This reverts commit d0d404d342.

* allow for `plc_conversion_rate` field to be reset

* fetch exchange rate using price list currency and company currency not form currency

* clean up
2018-02-12 15:18:57 +05:30
tundebabzy
c89782502c Report presentation currency (#12670)
* Add new Select to filters

* get the currencies from database rather than hardcoded

* label report columns:
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency

* add new function - get_currency

* tweak new function `get_currency`

* add new function `convert` to convert a value to another currency

* add new function `convert_to_presentation_currency`

* clean up `get_currency` first pass

* memoise the exchange rates

* limit fetched GL entries to to_date

* check if account type is p&l or not and use appropriate exchange rate based on that

* change EXCHANGE RATE to a dict, use for memoisation

* rename EXCHANGE_RATE

* cache exchange rates and use them as needed

* add docstrings

* add presentation currency logic to financial statement reports

* move new functions from `general_ledger.py` to new module

* clean up

* PEP 8 clean up

* move function to util.py

* PEP 8 clean up

* remove presentation currency option from cashflow

* adjust currency as needed

* allow users to save presentation currency in Accounts Settings

* add new function `get_presentation_currency_list`

* refactor query_report modules with no promises

* Revert "allow users to save presentation currency in Accounts Settings"

This reverts commit 3b58a6296c.

* show print page in correct currency

* Update utils.py
2018-02-12 15:04:50 +05:30
joezsweet
04338cfb4b removed extra spaces 2018-02-12 10:12:27 +01:00
joezsweet
f9cb7ea611 removed extra spaces 2018-02-12 10:05:59 +01:00
sivankar
621740efd9 Enhancement and bug fix in batch (#12753)
* merge shelf like and manufacturing date

* setting default manufacturing date as todays date

* setting default manufacturing date as todays date

* fix

* Improvements to batch auto naming (#12496)

* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test

* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set

* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'

* added manufacturing date wise sort

* added prefix to expiry date and manufacturing date
2018-02-12 14:33:40 +05:30
Fahim Ali Zain TP
277935be79 Deduct Rejected Item's Raw materials in SubContracting (#12837)
* Deduct Rejected Item's Raw materials in SubContracting frappe/erpnext#12752

* Travis Build Fix
2018-02-12 11:59:07 +05:30
Revant Nandgaonkar
2dee8fc255 Hotels (#11907)
* [new-module] hotels, start

* Multiple Changes

Hotel Settings Added
Make invoice on Hotel Reservation

* Hotel Room validation for overbooking

* Added test fixtures and test for Hotels

* Added Tests for Hotels

Overbooking
Pricing not set

* [WIP] Documentation

Hotel Room and Screenshot

* Added Calendar view for Hotel Room Reservation

* Added Report - Hotel Room Occupancy

* Added Hotel Reservation User in Hospitality domain
2018-02-12 11:57:12 +05:30
rohitwaghchaure
6e7e70c977 Added PDC from journal entry in AR report (#12844) 2018-02-12 11:55:07 +05:30
rohitwaghchaure
0aeeb7e02c [Fix] Item variant details report (#12869) 2018-02-12 11:44:39 +05:30
Shreya Shah
caccd2289d posting-date-fix (#12849) 2018-02-12 11:34:46 +05:30
Jamsheer
be9eae06ec Physician - Set Details by User or Employee (#12558) 2018-02-12 11:33:44 +05:30
Ameya Shenoy
5c33a04043 Shareholder and related doctypes (#12215)
* Added doctypes related to shares

- Shareholder doctype, the entity who does the transaction
- Share doctype, a child table to kepp list of all shares
- Share Transfer doctype, Logs of all made transactions

* Added logic for share transfer

- update shareholder automatically on share transfer/issue/purchase
- purchase and transfer have method remove_share which doesn't get executed because of some bug

* Added report view for share ledger

* Removed share number tracking

- removed share number tracking from Share Ledger child table for Shareholder doctype
- new doctype Share Type created

* Share Balance report added

- math behind Share Balance report needs fixing

* Changes in shareholder

- Share numbers are not tracked in Shareholder
- Share Ledger doctype deleted
- Share Balance Report bug fixed

* Shareholder

- fixed report for share balance
- remove bug from share transfer by making share type mandatory
- added buttons to shareholder for direct link to report

* Added tests for Share Transfer

* minor codacy fixes

* Added Shareholder to Party Type

* rate in share ledger & balance report is currency

* First attempt at modelling shares after Item

* Share Manager changes

- on creation of shareholder party it should check if the same combo exists
- in shareholder party make report button visible iff folio no exists
- create folio no on creation of share transfer iff it doesnt already exist
- move reports from shareholder to shareholder party

* Shareholder chages

- delete share child table doctype
- autoname added to folio no
- modify tests for share transfer

* minor changes

* removed share_no child doctype

* Restructured Share Transfer Logic (not tested)

- Everything revolves around Share Balance child table in Shareholder Party
- is_company flag still to be utilized

* Tested Share Tranfer

* minor fixes

* started new shareholder structure

* modified shareholder

* renamed Shareholder Party to Shareholder

* Shareholder rewrite complete

* new tests for shareholder written

* codacy fixes

* Added documentation
2018-02-12 11:32:47 +05:30
Britlog
be9a7231d4 Fix bootstrap layout and move checkout button upper (#12063) 2018-02-12 11:28:57 +05:30
rohitwaghchaure
45ac31ab93 [Fix] Not able to save sales order (#12851) 2018-02-12 11:27:37 +05:30
rohitwaghchaure
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
Jamsheer
00c1cf0a5a Healthcare Menu Fixes (#12830) 2018-02-12 11:24:12 +05:30
rohitwaghchaure
13afef2f72 Merge pull request #12853 from saurabh6790/timesheet_fixes
[fix] execute update_time_and_costing and update_project only for distinct task and projects
2018-02-12 11:19:22 +05:30
Saurabh
cab73b8a02 [fix] execute update_time_and_costing and update_project only for distinct task and projects 2018-02-09 17:04:12 +05:30
Nabin Hait
b0819b528f Minor fixes in gstr reports (#12848) 2018-02-09 15:30:55 +05:30
rohitwaghchaure
2bdc4ce70d Merge pull request #12831 from PawanMeh/fixes_12829
Add Total Qty to online POS
2018-02-09 14:49:21 +05:30
Manas Solanki
c7a9e3424b Merge pull request #12845 from manassolanki/fix-so-update
don't set the ordered_qty in SO on load from BIN
2018-02-09 13:16:14 +05:30
Manas Solanki
a884bd9c6a don't set the ordered_qty in SO on load from BIN 2018-02-09 13:12:07 +05:30
rohitwaghchaure
7e75165826 Merge branch 'develop' into fixes_12829 2018-02-09 12:01:41 +05:30
pawan
081f40c1bf readded pos.css 2018-02-09 11:56:32 +05:30
Saurabh
0f3c4fa7a7 Codacy fix - used classmethod decorator 2018-02-09 11:30:11 +05:30
Saurabh
c29f3c70dc Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-09 10:51:49 +05:30
Saurabh
b4ab89e1da [Mod] Code refactored to remove dependency on 'complete_address' field 2018-02-09 10:49:30 +05:30
Achilles Rasquinha
05bf8abab0 Merge pull request #12835 from manassolanki/education-docs
updated the docs for education
2018-02-09 10:37:54 +05:30
Manas Solanki
458a4e13bd updated the docs for education 2018-02-08 20:12:41 +05:30
pawan
1583120a54 remove pos.css 2018-02-08 20:00:12 +05:30
pawan
83b1b802d1 print hide and pos.less changes 2018-02-08 19:56:12 +05:30
pawan
33571dc567 print hide changes 2018-02-08 19:35:48 +05:30
pawan
31d37f110a print hide changes 2018-02-08 19:25:30 +05:30
Manas Solanki
37b2aa2b11 changes in the education module (#12827)
update the module page
    remove fee from beta
2018-02-08 19:00:51 +05:30
Pawan Mehta
e2bc8bb644 Update sales_invoice.json 2018-02-08 16:35:03 +05:30
pawan
735b8c6094 [fix] #12829 2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e resolved merge conflicts 2018-02-08 15:17:15 +05:30
Saurabh
f4211c4a52 Merge branch 'hotfix' 2018-02-08 15:04:25 +05:30
Saurabh
c1f982a9bb bumped to version 10.0.21 2018-02-08 15:34:25 +06:00
rohitwaghchaure
4d250585a6 Merge pull request #12824 from netchampfaris/hotfix-advance_payment
[hotfix] Advance Total validation
2018-02-08 14:32:29 +05:30
Faris Ansari
6041f5cb8c [hotfix] Advance Total validation 2018-02-08 13:33:52 +05:30
rohitwaghchaure
144c9977a2 Merge pull request #12819 from netchampfaris/hotfix-get_party_account
get_party_account only if company is set
2018-02-08 11:42:41 +05:30
rohitwaghchaure
f1fa338999 Merge pull request #12816 from mntechnique/hotfix-for-#12810
Does not allow discount over 100% in POS
2018-02-08 11:42:08 +05:30
Faris Ansari
f7717b9ec2 get_party_account only if company is set 2018-02-08 11:11:21 +05:30
Prateeksha Singh
152bf37e7f Merge pull request #12813 from pratu16x7/hub-fixes
Hub listing and entity page
2018-02-08 10:47:16 +05:30
pawan
5f779eb805 validation fix 2018-02-08 09:07:58 +05:30
Saurabh
1a4d77a962 Fixes #12810 for Offline POS 2018-02-08 01:32:48 +05:30
Saurabh
056c1709c6 Fixes #12810 2018-02-08 00:22:53 +05:30
Saurabh
0de0861bb4 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-08 00:10:49 +05:30
Prateeksha Singh
4413ce1be1 company page, deprecate custom page 2018-02-07 23:50:01 +05:30
pawan
2b885beaee code changes for single stock entry 2018-02-07 19:06:18 +05:30
Bassam Ramadan
fd044a0d5e docs-fixes (#12805) 2018-02-07 18:59:06 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
Nabin Hait
7ec8a2eae0 Merge branch 'chdecultot-asset_depreciation_based_on_fiscal_year' into develop 2018-02-07 18:25:57 +05:30
Nabin Hait
ed26028a93 Minor fixes for depr based on FY 2018-02-07 18:25:45 +05:30
Nabin Hait
82a61c3bd9 Deleted restaurant order entry test cases 2018-02-07 16:56:07 +05:30
Nabin Hait
c224d34a2c Merge branch 'master' into develop 2018-02-07 16:07:20 +05:30
Nabin Hait
0725eab858 Merge branch 'hotfix' 2018-02-07 16:07:19 +05:30
Nabin Hait
67d6dc1ac6 bumped to version 10.0.20 2018-02-07 16:37:19 +06:00
Nabin Hait
33f967d97c Account name length fixed in HUngary and Germen COA 2018-02-07 16:00:42 +05:30
Nabin Hait
e2aec86bfa Merge branch 'mntechnique-pos_pf_with_draft_status' into develop 2018-02-07 12:40:56 +05:30
Nabin Hait
4b1bd15f7e Draft status in pos print format 2018-02-07 12:40:45 +05:30
rohitwaghchaure
9a5037193f Removed DR/CR from balance column (#12791)
* Removed DR/CR from balance column

* Update general_ledger.html

* Update general_ledger.py
2018-02-07 12:10:14 +05:30
Shreya Shah
80423de611 posting date in journal entry should not be nowdate (#12801) 2018-02-07 12:08:08 +05:30
Manas Solanki
b4693c6957 fix for making the invoice from the timesheet (#12803) 2018-02-07 12:07:27 +05:30
rohitwaghchaure
ba31369764 Merge pull request #12773 from rohitwaghchaure/change_amount_issue
[Fix] Incorrect change amount if enabled rounded total
2018-02-06 17:27:04 +05:30
Saurabh
50f7e29814 [New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed 2018-02-06 00:23:21 +05:30
Rohit Waghchaure
e8d22bb999 [Fix] Incorrect change amount if enabled rounded total 2018-02-05 18:13:29 +05:30
joezsweet
097a98cc10 fixed spaces to tabs 2018-02-05 13:16:00 +01:00
joezsweet
a8d5ef4891 space to tabs 2018-02-05 13:06:30 +01:00
Saurabh
e26773d91e Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-05 17:05:29 +05:30
joezsweet
5f473611bd space to tab 2018-02-05 12:05:11 +01:00
joezsweet
2f7ab065fb - removed barcodes from force_item_fields 2018-02-05 11:54:32 +01:00
Nabin Hait
211b6c1fd7 Merge branch 'vishdha-gstr2_report' into develop 2018-02-05 16:10:16 +05:30
Nabin Hait
b02c109e1d Cleanup and fixes on GSTR-2 2018-02-05 16:09:51 +05:30
Prateeksha Singh
3eaccffbd9 [hub] items searchable via core filters 2018-02-05 12:58:30 +05:30
Prateeksha Singh
b8e9c9be08 [hub] form (info) view for items 2018-02-05 12:58:30 +05:30
Faris Ansari
9b64620bc0 [hub] hub page using BaseList 2018-02-05 12:57:49 +05:30
Vishal Dhayagude
cce29fabf4 [fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry (#12767) 2018-02-05 12:25:51 +05:30
rohitwaghchaure
0f5c18ca81 [Fix] For non stock item, not able to place an order from shopping cart (#12758) 2018-02-05 12:25:02 +05:30
rohitwaghchaure
a4c40e0fd6 [Fix] After accesing POS page, it does not work when going back from another page (#12763) 2018-02-05 12:24:06 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Nabin Hait
59aca770c1 Merge branch 'hotfix' 2018-02-03 09:13:12 +05:30
Nabin Hait
9d2f04139c bumped to version 10.0.19 2018-02-03 09:43:12 +06:00
rohitwaghchaure
151834d746 Merge pull request #12741 from Helkyd/develop
Update Trial balance
2018-02-02 22:29:21 +05:30
Helkyd
5e93b02c85 Update trial_balance.py
Assuming that Account_number has NUMBERs will sort.
2018-02-02 12:27:30 +00:00
Saurabh
70d972d92e [Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail' 2018-02-02 16:18:17 +05:30
Saurabh
41c47e3ffa Merge pull request #12677 from tundebabzy/issue-12535-1
Website Cart Should Not Show Expired Items As 'In Stock' #12535
2018-02-02 15:58:07 +05:30
rohitwaghchaure
cf6360d825 Merge pull request #12739 from jay-parikh/hotfix
Enable/Disable Discount in POS using POS Profile #11748
2018-02-02 13:12:38 +05:30
Jay Parikh
2c95ab3897 Code fix for Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 22:52:58 -08:00
Jay Parikh
171e5af995 Fixed indentation issue in pull # 11748 2018-02-01 21:39:20 -08:00
tundebabzy
5df64d84a1 code review fix 2018-02-01 17:05:54 +01:00
tundebabzy
a829d5a4d5 Merge branch 'hotfix' into issue-12535-1 2018-02-01 16:56:05 +01:00
Helkyd
b258686b00 Update trial_balance.py
Fix to order only if account starts with Number ... while for others not required....
2018-02-01 15:53:30 +00:00
Nabin Hait
91c5e4c429 Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings (#12734) 2018-02-01 18:58:22 +05:30
Nabin Hait
cae13bf048 Fixes in purchase register report (#12737) 2018-02-01 18:58:14 +05:30
Nabin Hait
2aba97bff1 Fetch items from BOM in Material Request 2018-02-01 18:52:50 +05:30
Jay Parikh
d4359faa31 Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 04:26:24 -08:00
rohitwaghchaure
c830344ca7 Merge pull request #12738 from rohitwaghchaure/hotfix_pos_issue
[Fix] Pay button not working in pos
2018-02-01 17:39:33 +05:30
Rohit Waghchaure
d85247cd7a [Fix] Pay button not working in pos 2018-02-01 17:18:38 +05:30
rohitwaghchaure
441032d39c Merge branch 'develop' into develop 2018-02-01 16:54:10 +05:30
Nabin Hait
b9ce104b09 Opening balance in stock ledger report (#12729) 2018-02-01 14:58:50 +05:30
Saurabh
7c8d508e28 [Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method 2018-02-01 14:40:49 +05:30
Saurabh
df8add272c Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-01 14:02:09 +05:30
Raghavendra Kamath
2afa8277a7 Update Readme to add new erpnext logo (#12728) 2018-02-01 11:53:01 +05:30
Nabin Hait
7ba092eaf9 Fixes for making stock entry against Pro Order (#12721) 2018-02-01 10:51:27 +05:30
Saurabh
f16d45b0a0 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
Resolved Conflicts:erpnext/selling/doctype/customer/customer.json
2018-02-01 02:05:30 +05:30
Rushabh Mehta
82fa04ce32 Update projects.py 2018-01-31 22:20:14 +05:30
Saurabh
9f5c2002ff [Mod] Removed the Dependency on Frappe PR
[Fix] Fixed a possible bug
2018-01-31 17:43:58 +05:30
rohitwaghchaure
32a5f38595 Merge pull request #12633 from vishdha/issue_12388
[fix] Sales order link to purchase order not working fixed
2018-01-31 17:30:43 +05:30
tundebabzy
4990cf7783 remove stray code 2018-01-31 11:35:56 +01:00
Saurabh
9f29f60707 Merge pull request #12581 from britlog/website-product-spinner
[Website] Add number spinner for quantities in product page
2018-01-31 15:58:04 +05:30
Nabin Hait
ec2c9ec897 Merge branch 'master' into develop 2018-01-31 15:39:16 +05:30
Nabin Hait
8f38a17c14 Merge branch 'hotfix' 2018-01-31 15:39:15 +05:30
Nabin Hait
bff1971bb2 bumped to version 10.0.18 2018-01-31 16:09:15 +06:00
Zarrar
4e05f02038 error in throw message rectify (#12719) 2018-01-31 15:33:51 +05:30
Nabin Hait
7918b92d95 Invalid date value comparison, fixes for mariadb 10.2.3+ 2018-01-31 15:30:03 +05:30
tundebabzy
29c8142678 refactor adjust_for_expired_items and others as per code review
use get_all instead of get_list

rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`
2018-01-31 10:51:06 +01:00
vishdha
df1653827f [fix] Patch for material request to purchase order added 2018-01-31 15:11:24 +05:30
Vishal
fc05cc4e70 [fix] link with supplier quotation to purchase order 2018-01-31 15:10:39 +05:30
Vishal
4dc329f5ea [fix] Sales order link to purchase order not working fixed 2018-01-31 15:10:39 +05:30
Nabin Hait
e37e5d6134 minor fix in patch for mariadb version 2018-01-31 15:00:18 +05:30
rohitwaghchaure
2056ea6fb4 Update customer.js 2018-01-31 14:48:53 +05:30
Zarrar
dea99cc3a8 treeview not set when routed from bom form (#12707) 2018-01-31 13:07:04 +05:30
Kenneth Sequeira
f6daf56054 Added Tutorial Videos for Education in User Manual (#12678)
* added erpnext education tutorial videos to the manual

* testing with div

* Update program-enrollment.md

Properly ended YouTube video.

* removed group assessment criteria page
2018-01-31 12:49:58 +05:30
Achilles Rasquinha
6ceffbd2f8 Merge pull request #12710 from achillesrasquinha/12704
Python 3 Compatible Fixes.
2018-01-31 11:23:05 +05:30
Nabin Hait
bc640fe6a6 minor fix in old patch 2018-01-30 19:26:28 +05:30
saurabh-bhosale
0c9a99a953 Merge branch 'develop' into show_address_in_online_pos 2018-01-30 17:48:12 +05:30
Achilles Rasquinha
39f3d7e3aa local import 2018-01-30 16:58:49 +05:30
Nabin Hait
dba5e7645b Minor fix in old patch 2018-01-30 16:38:47 +05:30
Nabin Hait
927d13fadb Minor fix in old patch 2018-01-30 15:59:44 +05:30
Nabin Hait
0f75a022f2 Minor fix in old patch 2018-01-30 15:32:17 +05:30
Nabin Hait
4eae6c985c Fixed test records for supplier 2018-01-30 15:27:29 +05:30
Nabin Hait
b9e8b917b6 Removed ui-tests from travis 2018-01-30 15:08:33 +05:30
Achilles Rasquinha
ac57c87bc3 Fixed spacing 2018-01-30 14:05:18 +05:30
Achilles Rasquinha
244dcae110 Fixed spacing 2018-01-30 14:03:59 +05:30
Achilles Rasquinha
ef58be1302 Fixed education string 2018-01-30 13:58:43 +05:30
tundebabzy
df50a6f828 Merge pull request #12705 from achillesrasquinha/12704
Fix for python 3 compatibility
2018-01-30 09:26:51 +01:00
system19
4e195d97c7 Minor - Healthcare Desktop UI (#12657)
* Minor - Healthcare Desktop UI

Minor - Healthcare Desktop UI

* Update desktop.py
2018-01-30 13:48:24 +05:30
Achilles Rasquinha
2862e25f3e fixed python3 error 2018-01-30 13:47:18 +05:30
vishdha
1910530e41 [fix] CDNR negative value 2018-01-30 12:19:56 +05:30
tundebabzy
2f4854ad1a create new dialog everytime (#12696) 2018-01-30 12:18:15 +05:30
Nabin Hait
585254456e Check credit limit while making DN, if bypassed on SO (#12702) 2018-01-30 12:11:22 +05:30
vishdha
109b408d11 [fix] minor changes in gst field alignment 2018-01-30 12:11:13 +05:30
vishdha
963dd1e4bc [minor] ITC data append to row 2018-01-30 11:51:57 +05:30
rohitwaghchaure
ce5b93ca77 [Fix] Allow user to edit rate in online POS (#12701) 2018-01-30 10:39:46 +05:30
vishdha
e03e4a581f [fix] Fetch correct Tax Details 2018-01-29 22:55:23 +05:30
vishdha
98e33c31cd [wip] Gstr2 2018-01-29 22:54:38 +05:30
Cesar
d8b1927e8d Allow no ZERO Payment
Allow no ZERO Payment
2018-01-29 15:39:52 +01:00
Helkyd
d6a61ad0c3 Trial Balance sort by Account Name
Trial Balance order by Account Name
Used Sorted under Prepare_data Function.
2018-01-29 13:47:12 +00:00
Saurabh
59c915f599 Merge branch 'master' into develop 2018-01-29 18:53:54 +05:30
Saurabh
32c2c474fd Merge branch 'hotfix' 2018-01-29 18:53:53 +05:30
Saurabh
f3d30c5bb9 bumped to version 10.0.17 2018-01-29 19:23:53 +06:00
Saurabh
8df20f6501 Merge pull request #12695 from Zlash65/fix-dn
[Hotfix] Stock entry issue
2018-01-29 18:52:32 +05:30
Zlash65
f7a4d4221b check precision with qty 2018-01-29 18:47:21 +05:30
Shreya Shah
406d449e12 fix posting date in journal entry on load (#12694) 2018-01-29 18:01:20 +05:30
Saurabh
d581ff40ea Merge branch 'master' into develop 2018-01-29 17:42:37 +05:30
Saurabh
e2021252d9 Merge branch 'hotfix' 2018-01-29 17:42:37 +05:30
Saurabh
373066e0ca bumped to version 10.0.16 2018-01-29 18:12:37 +06:00
rohitwaghchaure
52beb77539 Don't validate payment terms for POS (#12692) 2018-01-29 17:40:44 +05:30
Saurabh
e1e690541c set payment term name in payment_terms (#12693) 2018-01-29 17:39:56 +05:30
Saurabh
61f85a8dbd Merge pull request #12691 from frappe/codingCoffee-patch-1
conflict fix
2018-01-29 17:08:49 +05:30
Ameya Shenoy
471e27559f conflict fix 2018-01-29 17:07:57 +05:30
rohitwaghchaure
86c7ede321 Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11 [Fix] Subscription send notification issue 2018-01-29 16:53:37 +05:30
Zarrar
5bf77beb83 precision while checking qty (#12688) 2018-01-29 16:47:52 +05:30
Nabin Hait
1e1b2364ab Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment (#12689) 2018-01-29 16:45:43 +05:30
Cesar
58c040cffb Revert "Sort by account name"
This reverts commit 5cf01d9702.
2018-01-29 11:57:15 +01:00
Saurabh
03f6b3e588 resolved merge conflicts 2018-01-29 16:25:33 +05:30
Saurabh
4d50fac869 Merge branch 'hotfix' 2018-01-29 16:24:55 +05:30
Saurabh
05eed01eec bumped to version 10.0.15 2018-01-29 16:54:55 +06:00
Cesar
5cf01d9702 Sort by account name
Trial balance not sorted .. by adding those changes fixes the problem.
2018-01-29 11:54:12 +01:00
Nabin Hait
cfa9d1adb7 Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date

* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
rohitwaghchaure
c385017056 Merge pull request #12638 from adityaduggal/develop
Resolves Issue #12630 -Added Filters to AR
2018-01-29 12:37:39 +05:30
rohitwaghchaure
d36ac27f94 Update accounts_receivable.py 2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708 Update accounts_receivable.py 2018-01-29 12:34:19 +05:30
tundebabzy
c7c1defe64 after adjusting stock_qty for expired, set in_stock flag 2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b adjust stock_qty for expired quantities
adjust based on warehouse

add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
2018-01-27 12:16:13 +01:00
tundebabzy
186bea6e95 Merge pull request #12674 from tundebabzy/issue-12673-1
Batch List Shows Wrong Expired Status For Batches #12673
2018-01-27 07:50:12 +01:00
tundebabzy
794ecda618 corrected wrong get_diff arguments 2018-01-27 05:54:40 +01:00
tundebabzy
2d4b99917d Merge pull request #12664 from chdecultot/fec2
[Hotfix] Doc file rename
2018-01-26 23:17:46 +01:00
Charles-Henri Decultot
241b09ee11 Addition of index.txt 2018-01-26 07:53:59 +00:00
Charles-Henri Decultot
d0c2f7b754 Doc file rename 2018-01-26 07:09:11 +00:00
Vishal Dhayagude
c463c0684d [Report] GSTR - 1 CDNR Report (#12554)
* [wip] cdnr

* [WIP] cdnr with optional data

* [wip] Export GSTR-1

* [minor] Minor changes in export

* [new] Custom field added for GST

* [fix] Minor changes in GSTR1 Report

* [minor] Minor changes in gstr1

* [fix] Codacy Fixed

* Update setup.py
2018-01-26 11:27:22 +05:30
Manas Solanki
8985077652 Assessment Module Report (#12605)
* updated course wise assessment report

* added new report Final assessment grades
2018-01-26 11:20:33 +05:30
Andy Villiger
567623654b Resolve issue #10914 - Error when making Sales Invoice (#12656)
* Resolve issue #10914

An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code.

* Update sales_order.py
2018-01-26 11:11:19 +05:30
tundebabzy
db4fd7f5b6 Improvements to batch auto naming (#12496)
* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test
2018-01-26 11:00:20 +05:30
rohitwaghchaure
bfa898ff9b [Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537) 2018-01-26 10:59:00 +05:30
tundebabzy
0a33a359ca Merge pull request #12659 from tundebabzy/issue-12658
set batch number only in Sales Invoice and Delivery Note - #12659
2018-01-26 06:10:13 +01:00
tundebabzy
f9b5c74871 set batch number only in Sales Invoice and Delivery Note 2018-01-25 19:21:05 +01:00
Prateeksha Singh
4c58299eb0 [fix] encode if letterhead 2018-01-25 17:29:57 +05:30
Saurabh
aaaf5c62b6 [Mod] Minor changes in 'primary_address' field's property 2018-01-25 17:28:57 +05:30
rohitwaghchaure
fc318ebeff Merge pull request #12642 from mntechnique/fix-to-issue-#12512
Fix to issue #12512
2018-01-25 17:13:05 +05:30
rohitwaghchaure
3574c96c8c Update item_dashboard_list.html 2018-01-25 17:11:52 +05:30
rohitwaghchaure
ec3052cc8f Merge pull request #12652 from shreyashah115/patch-fix
Patch fix for Leave Application Workflow
2018-01-25 17:08:50 +05:30
Shreya
1416567139 patch fix for leave-workflow 2018-01-25 17:06:14 +05:30
Vinayak Jethe
5743ce2b6b Made changes as per suggestions 2018-01-25 13:37:20 +05:30
Saurabh
6614d8aa01 Multiple changes:
[Mod] Added 'primary_address_and_contact_detail' in toggle_display
[Mod] Added a description for 'primary_address_and_contact_detail'
2018-01-25 12:27:00 +05:30
Saurabh
5a2354149c Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-01-25 11:56:36 +05:30
rohitwaghchaure
8d4e63c1fd Merge pull request #12639 from shreyashah115/workflow-patch-fix
Leave Workflow patch fixes
2018-01-24 22:36:34 +05:30
Shreya
5f264fa364 fixes 2018-01-24 20:39:30 +05:30
Vinayak Jethe
84f7727432 Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512 2018-01-24 19:48:24 +05:30
Vinayak Jethe
549c196beb Fixes issue #12512 2018-01-24 19:47:59 +05:30
Shreya
61cf49dd07 workflow patch fix 2018-01-24 18:50:01 +05:30
rohitwaghchaure
1bf4015567 Merge pull request #12632 from mntechnique/solves_issue_#12588
Solves issue #12588
2018-01-24 18:26:39 +05:30
Aditya Duggal
2136a7bded Resolves Issue #12630 -Added Filters to AR
- Added Territory Filter to AR report
- Added Sales partner filter
- Added Sales person filter
-Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column
-Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.
2018-01-24 18:16:08 +05:30
Saurabh
cadd31cb0c [Fix] Solves issue #12588 2018-01-24 16:38:22 +05:30
rohitwaghchaure
8df0556af5 Merge pull request #12587 from shreyashah115/leave-workflow
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Shreya
a8a952deff check if workflow_state_name already exists 2018-01-24 15:00:54 +05:30
Rushabh Mehta
29bc14d242 [fix] ficher_des_ecritures patch 2018-01-24 14:39:04 +05:30
Vinayak Jethe
46c82c45e0 Revised changes for codacy 2018-01-24 14:24:58 +05:30
Shreya
a309a871b5 Codacy fix 2018-01-24 13:56:16 +05:30
Vinayak Jethe
2c8ce5a717 Fixes issue #12512 2018-01-24 13:51:26 +05:30
Shreya
a400e7b568 Fixed as per the review 2018-01-24 13:30:20 +05:30
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Saurabh
6c3289dbcd Merge branch 'hotfix' 2018-01-24 11:22:54 +05:30
Saurabh
381d452b78 bumped to version 10.0.14 2018-01-24 11:52:53 +06:00
Saurabh
769874d0e9 Merge pull request #12628 from saurabh6790/enable_rename_option
[fix] enable rename for payment terms and payment term template
2018-01-24 11:15:53 +05:30
Saurabh
6cc10104f0 [fix] enable rename for payment terms and payment term template 2018-01-24 11:15:02 +05:30
Saurabh
5b67f4d953 Merge pull request #12626 from saurabh6790/item_price_stock_report_fix
[fix] If buying or selling price list not found, return empty dict
2018-01-24 10:55:51 +05:30
rohitwaghchaure
56a4f9205a Merge pull request #12620 from mntechnique/draft-mode-print
Print Functionality in Online POS using allow print before pay check
2018-01-24 10:54:07 +05:30
Saurabh
9c6bf08e77 Merge pull request #12547 from joshreeder/patch-1
Update dropbox-backup.md
2018-01-24 07:57:15 +05:30
Saurabh
4b9a55b0ef [fix] If buying or selling price list not found, return empty dict 2018-01-24 07:48:56 +05:30
Saurabh
b665baec72 Used cint instead of int 2018-01-23 18:28:05 +05:30
Saurabh
c8399fd093 Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno
Disabled property set only once for has serial no and has batch no field in item doctype
2018-01-23 18:08:56 +05:30
Rohit Waghchaure
266e66cd1b Disabled property set only once for has serial no and has batch no field in item doctype 2018-01-23 18:06:12 +05:30
Saurabh
a5c9fc3705 Removed commented code 2018-01-23 17:36:41 +05:30
rohitwaghchaure
f3a452850e Merge pull request #12617 from saurabh6790/ux_fix
parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 17:35:16 +05:30
Saurabh
6c5f5b20cf Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print 2018-01-23 17:33:21 +05:30
Charles-Henri Decultot
e31e1239ba FEC report for France (#12446)
* FEC report for France

* Codacy correction
2018-01-23 17:23:27 +05:30
Jamsheer
58af1db0d7 Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 17:23:27 +05:30
Shreya Shah
673b59b114 Updated docs for Payroll Entry (#12552)
* updated docs for payroll entry

* fixed a link in employee-advance doc
2018-01-23 17:23:27 +05:30
Shreya
543feda2fb set posting date only if null 2018-01-23 17:23:27 +05:30
Saurabh
cbbee47625 [Fix] Resolved the type issue of 'is_saved' flag variable 2018-01-23 17:23:27 +05:30
Saurabh
a2076a1ff0 Multiple changes:
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
2018-01-23 17:23:26 +05:30
Saurabh
c5a6cf3a0e [Mod] Allows print only when the check value exists and the cart isn't empty 2018-01-23 17:23:26 +05:30
Saurabh
3a609108ae Codacy changes 2018-01-23 17:23:26 +05:30
Saurabh
32695a938f [Mod] Refactored the code for fetching allow_print_before_pay check value 2018-01-23 17:23:26 +05:30
deepak-mnt
d7da89bf5a [Fix] Resolved issues suggested by Codacy 2018-01-23 17:21:44 +05:30
deepak-mnt
8f3d394485 Minor changes:Removed extra spaces in py code 2018-01-23 17:21:44 +05:30
deepak-mnt
cc813d2286 [Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode 2018-01-23 17:21:44 +05:30
deepak-mnt
1ccb0cfa2f [Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
2018-01-23 17:21:44 +05:30
deepak-mnt
29abe291c9 Allow draft mode print in online POS 2018-01-23 17:21:44 +05:30
Saurabh
57df096725 Merge pull request #12600 from vishdha/allow_rename
[new] Allow Rename and Member link with user
2018-01-23 16:49:48 +05:30
Saurabh
db2d02a3e3 Merge pull request #12618 from shreyashah115/warehouse-list
Disabled field in list view - Warehouse DocType
2018-01-23 16:48:59 +05:30
Shreya
dfae11bcee disabled warehouse in list view 2018-01-23 16:46:24 +05:30
Rushabh Mehta
b5a3df920c [fix] primary button color for make 2018-01-23 16:08:52 +05:30
rohitwaghchaure
d78e6e04ea Run country fixtures if country changed in the company (#12494) 2018-01-23 15:42:46 +05:30
Saurabh
3959aeb848 [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice 2018-01-23 15:40:43 +05:30
Charles-Henri Decultot
90657fb566 FEC report for France (#12446)
* FEC report for France

* Codacy correction
2018-01-23 15:40:14 +05:30
Jamsheer
d63b7e16af Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 15:38:34 +05:30
Shreya Shah
3191951bff Updated docs for Payroll Entry (#12552)
* updated docs for payroll entry

* fixed a link in employee-advance doc
2018-01-23 15:37:23 +05:30
rohitwaghchaure
881d32c4b8 Merge pull request #12540 from shreyashah115/posting-date
[Payroll Entry] Set posting date only if null
2018-01-23 15:10:26 +05:30
rohitwaghchaure
f8a98f5eeb Merge pull request #12609 from britlog/payment-request-translation
[Stripe] Translate payment request subject
2018-01-23 14:47:55 +05:30
rohitwaghchaure
b607c6f8b2 Merge pull request #12610 from MaxMorais/patch-7
Serial No, wont relates to the warehouse
2018-01-23 14:46:46 +05:30
Frappe PR Bot
48d4a0a438 [Translation] Updated Translations (#12613) 2018-01-23 14:35:52 +05:30
rohitwaghchaure
51293390e4 Merge pull request #12611 from shreyashah115/fetch-conversion-factor
[Fix] Fetch uom conversion factor in material request
2018-01-23 12:41:01 +05:30
rohitwaghchaure
63f4da4402 Merge pull request #12612 from shreyashah115/fix-validation
Fix validation message for overbilling
2018-01-23 12:35:37 +05:30
pawan
9b7093e4d6 validation code improvement 2018-01-23 11:39:53 +05:30
Shreya
a137fe82a1 fix error message 2018-01-23 11:00:58 +05:30
Shreya
e2b31085a7 fetch uom conversion factor in material request 2018-01-23 10:54:23 +05:30
Maxwell Morais
7cffd618ab Serial No, wont relates to the warehouse
The serial no, picker wont follow the target serial no
2018-01-22 22:33:28 -02:00
britlog
ddd2bc9aac Translate payment request subject 2018-01-22 23:23:31 +01:00
pawan
6a8eba891e Move target warehouse validation to submit 2018-01-23 00:57:44 +05:30
pawan
afab0a64e5 code alignment 2018-01-22 17:34:27 +05:30
pawan
4ab6ef89a1 code alignment 2018-01-22 17:31:40 +05:30
pawan
67867529c0 [fix] #8540 2018-01-22 17:08:39 +05:30
Vishal
a54815fd9d [new] Allow Rename and Member link with user 2018-01-22 16:02:45 +05:30
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Saurabh
4f927ac3e8 Merge branch 'hotfix' 2018-01-22 15:29:14 +05:30
Saurabh
b9f678b350 bumped to version 10.0.13 2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2 Merge pull request #12573 from rohitwaghchaure/reorder_issue
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
2018-01-22 16:49:54 +07:00
Saurabh
e72915847c Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column
Added currency in balance column in general ledger print
2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue
[Fix] Income account can not be group
2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5 Merge pull request #12590 from shreyashah115/total-on-items-remove
[Fix] Calculate taxes when shipping rule not present at removal of item
2018-01-22 15:03:11 +05:30
rohitwaghchaure
c87a3370cd Merge pull request #12595 from rohitwaghchaure/image_path_in_item_search
[Fix] Image path showing in the item link
2018-01-22 15:01:58 +05:30
Shreya
5164997db7 delete column status 2018-01-22 14:13:03 +05:30
Rohit Waghchaure
c4c2bf0bfb [Fix] Image patch showing in the item link 2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f calculate total when items are removed 2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe [Fix] Income account can not be group 2018-01-22 12:35:36 +05:30
Shreya
dd66bc03c7 fixes 2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a modified patches.txt 2018-01-22 12:26:41 +05:30
Shreya
4298bcfa40 modified leave application tests 2018-01-22 12:26:41 +05:30
Shreya
05f7e14b5a replaced status with workflow_state 2018-01-22 12:26:41 +05:30
Shreya
117ddac033 patch to create workflow for existing leave applications 2018-01-22 12:26:41 +05:30
Josh Reeder
c8b9648c53 Changed instructions
No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.
2018-01-20 15:56:15 -06:00
rohitwaghchaure
cf7b6511ba Merge pull request #12574 from rohitwaghchaure/sales_payment_summary_issue
[Fix] Sales payment summary issue
2018-01-20 17:02:13 +05:30
Rohit Waghchaure
bc94914338 [Fix] Sales payment summary issue 2018-01-20 17:01:31 +05:30
Rohit Waghchaure
f83f6aae22 [Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests 2018-01-20 15:44:38 +05:30
rohitwaghchaure
6a81acfddf Merge pull request #12563 from Zlash65/general-ledger-fix
[Hotfix] General Ledger report not working for group_by_account filter
2018-01-20 12:55:35 +05:30
Rohit Waghchaure
edef642794 Added currency in balance column in general ledger print 2018-01-20 12:54:25 +05:30
Saurabh
24946ee4e0 Codacy fix 2018-01-20 04:28:35 +05:30
Saurabh
b664488d98 [Fix] Clears off the read-only fields in 'Primary Address and Contact Details' Section on blank link fields 2018-01-20 03:12:45 +05:30
Saurabh
24cae1cad6 Made Primary address field searchable and is displayed in Customer Link field options 2018-01-20 02:47:19 +05:30
britlog
d13985d1d0 Add number spinner for quantity 2018-01-19 18:31:25 +01:00
Zlash65
93344dff26 group_by_account not displayed fix 2018-01-19 19:06:39 +05:30
Rohit Waghchaure
abc0632925 Merge branch 'master' into develop 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
03adf84a8d Merge branch 'hotfix' 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
0e61b52022 bumped to version 10.0.12 2018-01-19 16:19:28 +06:00
rohitwaghchaure
0efd7934b8 Merge pull request #12530 from frappe/manassolanki-patch-2
Issue in the data import while importing the invoice
2018-01-19 15:35:23 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Rohit Waghchaure
16cde58821 Merge branch 'hotfix' 2018-01-19 13:29:56 +05:30
Rohit Waghchaure
e1815f0989 bumped to version 10.0.11 2018-01-19 13:59:56 +06:00
rohitwaghchaure
c59d52d073 Merge pull request #12550 from rohitwaghchaure/po_permission_issue
[Fix] Error in PO. No Permission for Buying Settings
2018-01-19 13:00:36 +05:30
rohitwaghchaure
7b605a628e Merge pull request #12543 from rohitwaghchaure/precision_issue_bom
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 13:00:16 +05:30
Rohit Waghchaure
2f3ad64bd6 [Fix] Precision issue while making material requests from production planning tool 2018-01-19 12:47:55 +05:30
Rohit Waghchaure
86cbde9057 [Fix] Error in PO. No Permission for Buying Settings 2018-01-19 12:45:53 +05:30
rohitwaghchaure
65a669c81e Merge pull request #12534 from rohitwaghchaure/patch_fix_v7
[Fix] Timesheet patch
2018-01-19 11:37:18 +05:30
rohitwaghchaure
39e0d1b7d6 Merge pull request #12539 from rohitwaghchaure/minor_sales_payment_summary_issue
[Fix] Sales payment summary issue
2018-01-19 11:34:48 +05:30
Josh Reeder
4c38e67f1a Update dropbox-backup.md
Steps for open source users were wrong and there were many work arounds. i have updated the instructions with the most streamlined process.
2018-01-18 15:38:59 -06:00
Shreya
d0b60e8254 set posting date only if null 2018-01-18 17:35:29 +05:30
Rohit Waghchaure
de420322b5 [Fix] Sales payment summary issue 2018-01-18 17:20:21 +05:30
rohitwaghchaure
c8e016522d Merge pull request #12533 from rohitwaghchaure/pos_css_issue
[Fix] POS css
2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1 [Fix] POS css 2018-01-18 16:10:19 +05:30
Rohit Waghchaure
95adb60a8f Fix patch 2018-01-18 15:52:52 +05:30
Manas Solanki
c6d5611408 Issue in the data import while importing the invoice 2018-01-18 11:20:24 +05:30
rohitwaghchaure
bd47abdc9a [Enhance] Running Balance in GL Report (#12491)
* Running Balance in GL Report

* Supplier invoice no in GL Report/Print Format
2018-01-18 09:32:43 +05:30
Faris Ansari
00e547d319 Encode letterhead filename (#12525) 2018-01-18 09:28:13 +05:30
Nabin Hait
f1b098e03c payment terms filter in AR Summary report (#12529) 2018-01-18 09:23:32 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
Nabin Hait
a7bcf6791e Merge branch 'hotfix' 2018-01-17 18:51:20 +05:30
Nabin Hait
f76fb50685 bumped to version 10.0.10 2018-01-17 19:21:20 +06:00
rohitwaghchaure
da941af687 Set due date in purchase invoice based on suppler invoice date (#12395) 2018-01-17 16:23:04 +05:30
Nabin Hait
91fd29a963 Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522) 2018-01-17 16:14:31 +05:30
Kenneth Sequeira
7030817bf2 fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions (#12500) 2018-01-17 16:13:28 +05:30
Gaurav Naik
dc0db3a652 Exploded view for BOM Stock Report (#12506)
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
2018-01-17 16:12:55 +05:30
Umair Sayed
d8b4c8bd5b Update index.txt (#12507) 2018-01-17 16:12:00 +05:30
Raghavendra Kamath
2967ec3d45 Add desk icons for healthcare - fixes 11838 (#12518)
* Add desk icons for healtcare - fixes 11838

* Remove unnecessary white spaces
2018-01-17 16:11:09 +05:30
Umair Sayed
230805b016 Update total.html (#12511) 2018-01-17 14:41:38 +05:30
rohitwaghchaure
60febc5465 [Fix] Gross profit validation issue (#12516) 2018-01-17 14:40:59 +05:30
Faris Ansari
4d4ce3e5cf Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517) 2018-01-17 14:40:27 +05:30
Vishal Dhayagude
052b51ab20 [fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513)
* [fix]Fetch UOM conversion and stock_uom from BOM into material Request

* Update material_request.js
2018-01-17 14:39:54 +05:30
Nabin Hait
2bfa1803e9 GL Entry on asset sale (#12514)
* GL Entry on asset sale

* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
Nabin Hait
b44ef0b249 Delete employee records on deletion of company 2018-01-16 19:21:02 +05:30
tundebabzy
d0cde99743 Merge pull request #12505 from frappe-pr-bot/translations-2018-01-16
[Translation] Updated Translations
2018-01-16 09:59:16 +01:00
frappe-pr-bot
f12dfe7b7c [Translation] Updated Translations 2018-01-16 09:37:11 +02:00
Saurabh
4b0dd8a159 Merge branch 'master' into develop 2018-01-15 18:36:35 +05:30
Saurabh
dfb1646a16 Merge branch 'hotfix' 2018-01-15 18:36:34 +05:30
Saurabh
d40bfeb7d3 bumped to version 10.0.9 2018-01-15 19:06:34 +06:00
Saurabh
af7df6ba50 Merge pull request #12495 from netchampfaris/hotfix-add-ac-2
[fix] is_root check
2018-01-15 18:35:54 +05:30
Faris Ansari
f18cd2eaf7 [fix] is_root check 2018-01-15 18:30:01 +05:30
Nabin Hait
a2426fcc9e Get default tax template only if tax template not selected or template is for other company (#12492) 2018-01-15 17:45:46 +05:30
umaepoch
832453a757 Added Delay days field to Ordered Items to be Delivered report (#12439)
* Added Delay Days to Ordered Items to be Delivered Report

* Ordered Items to be Delivered
2018-01-15 15:43:16 +05:30
Faris Ansari
184491bbbe [hotfix] Validate posting_time (#12484) 2018-01-15 14:18:53 +05:30
Achilles Rasquinha
b6365b729e Deleted Previous Chat Reference for Leave Application Approval (#12482)
* deleted previous chat reference

* txt to messge

* removed comment
2018-01-15 14:12:41 +05:30
Vishal Dhayagude
eec0f7fd6b [non_profit][fix] Chapter listing and join and leave chapter issue (#12463)
* [fix] Chapter listing and Join and leave chapter issue

* [minor] Changes in chapter html, chapter title to chapter name
2018-01-15 14:10:23 +05:30
Vishal Dhayagude
e04aedadcd [fix] Add to cart issue fixed (#12474) 2018-01-15 14:01:05 +05:30
ci2014
58dfc0782f Update agriculture_analysis_criteria.json (#12478) 2018-01-15 12:33:03 +05:30
Vishal Dhayagude
e88f928f0f [fix] Image with name listing (#12479) 2018-01-15 12:29:39 +05:30
Manas Solanki
8f085dc606 Merge pull request #12483 from frappe/manassolanki-patch-1
Update utils.py
2018-01-15 12:24:18 +05:30
Manas Solanki
e5e5d8271f Update utils.py 2018-01-15 12:22:28 +05:30
rohitwaghchaure
0a2d83d40c [Fix] gst_state field issue (#12481) 2018-01-15 11:55:25 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
Saurabh
e43a3c269a Merge branch 'hotfix' 2018-01-12 16:54:26 +05:30
Saurabh
59edc6028d bumped to version 10.0.8 2018-01-12 17:24:26 +06:00
Saurabh
93d3020e4b Merge pull request #12464 from Zlash65/fix-company-bom-deletion
[Fix] Delete BOM only when found
2018-01-12 16:47:54 +05:30
tundebabzy
e1e38a4bb9 Autoname for Batch DocType #12302 (#12461)
* add new fields:
check: use naming series
data: series prefix

* refactor autoname:
use new function - get_name_from_hash

* add new function - get_name_from_naming_series

* refactor autoname to generate name from naming series

* PEP 8 compliance
2018-01-12 16:30:02 +05:30
Manas Solanki
b19fd57043 [fix] set required quantity if item in bom found (#12460) 2018-01-12 16:28:30 +05:30
rohitwaghchaure
7b78f6bee6 Added rounded total in the POS and fix rounded issue in js side (#12457) 2018-01-12 16:28:16 +05:30
tundebabzy
df023bff7f add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
rohitwaghchaure
9fbed5617f [Fix] Wrong batch showing in the popup (#12421) 2018-01-12 16:22:33 +05:30
Manas Solanki
bba5fd7a38 Assessment module addition (#12417)
* add academic session details in the Assessmet Plan

* add the academic session and few details in the assessment result

* fix codacy
2018-01-12 16:21:09 +05:30
Zlash65
c9172e0079 delete boms only when found 2018-01-12 15:59:13 +05:30
Manas Solanki
6c3082591c change the resolution field to the text editor (#12449) 2018-01-12 12:00:13 +05:30
Nabin Hait
a49f720ee3 GSTR1 for B2B, B2CL and B2CS (#12459) 2018-01-12 11:59:59 +05:30
rohitwaghchaure
3955fa5102 [Fix] Email addres unique key issue (#12450) 2018-01-11 18:21:02 +05:30
joezsweet
3aaed03dfb reload item_barcode 2018-01-11 11:31:31 +01:00
Prateeksha Singh
b76202f1a4 Merge pull request #12447 from codingCoffee/travis-fix
mongodb removed from travis
2018-01-11 15:27:17 +05:30
Ameya Shenoy
4674b172aa mongodb removed from travis 2018-01-11 15:12:29 +05:30
joezsweet
1be684fd87 codici fix 2018-01-11 09:03:26 +01:00
joezsweet
b6fb8d2143 fix patch, reload doc 2018-01-11 08:44:59 +01:00
rohitwaghchaure
02302ff009 [Fix] Incoming rate for gross profit report (#12422) 2018-01-11 12:58:46 +05:30
Sachin Mane
24e2735e19 Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381)
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"

* Add Shelf Life (Item) and Manufacturing Date (Batch) fields

* remove console.log

* fix ci issues

* Update batch.js
2018-01-11 12:45:50 +05:30
rohitwaghchaure
5b45bcf5f3 [Fix] Report Available Stock for Packing Items Menu not working (#12400) 2018-01-11 12:39:09 +05:30
rohitwaghchaure
20dead5d91 [minor] UI change (#12440)
* [minor] UI change

* Update company.js
2018-01-11 12:31:14 +05:30
Charles-Henri Decultot
47ad7fb129 Multiple variant correction (#12424) 2018-01-11 12:29:45 +05:30
rohitwaghchaure
752d21e658 Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427) 2018-01-11 12:28:48 +05:30
Vishal Dhayagude
a48f69eb83 [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426)
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings

* Update gstr_1.py
2018-01-11 12:26:52 +05:30
Rushabh Mehta
8be6d74655 [minor] company.js buttons should be primary! 2018-01-11 11:20:16 +05:30
tundebabzy
3732033d9b Merge pull request #12435 from tundebabzy/packing-slip-msg
Better validation message in Packing Slip
2018-01-11 00:32:26 +01:00
tundebabzy
6f75885d86 better validation message 2018-01-10 23:14:13 +01:00
joezsweet
9116666288 fix patch 2018-01-10 23:11:13 +01:00
tundebabzy
c95675c074 Merge branch 'develop' into multi-barcode 2018-01-10 21:51:41 +01:00
tundebabzy
76dddbf26e Merge branch 'develop' into multi-barcode 2018-01-10 21:49:27 +01:00
Nabin Hait
619c42b934 GSTR1 for B2B (#12296) 2018-01-10 17:48:03 +05:30
Vishal Dhayagude
0099a09e9b [fix] fix print hide weight details in quotation print format (#12412) 2018-01-10 16:30:09 +05:30
Zarrar
94f9f48d70 set from_warehouse only if purchase_order and purpose found (#12398) 2018-01-10 16:29:40 +05:30
Nabin Hait
687dc6a424 patch fixed 2018-01-10 14:51:19 +05:30
tundebabzy
5c6e038769 Merge pull request #12396 from frappe-pr-bot/translations-2018-01-09
[Translation] Updated Translations
2018-01-09 16:32:17 +01:00
frappe-pr-bot
a20ef08ebf [Translation] Updated Translations 2018-01-09 13:29:17 +02:00
Nabin Hait
527e6c02b3 Delete BOMs on deletion of company 2018-01-09 16:29:13 +05:30
Nabin Hait
6b89644ca7 Payment terms filter in AR report 2018-01-09 15:39:35 +05:30
Pawan Mehta
d0e7367525 [fix] #12390 (#12391) 2018-01-09 14:33:25 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
Saurabh
471bc618b5 Merge branch 'hotfix' 2018-01-09 11:55:38 +05:30
Saurabh
0b3b63a9af bumped to version 10.0.7 2018-01-09 12:25:38 +06:00
rohitwaghchaure
412e044e8f [Fix] Error in stock move from batch dashboard (#12377) 2018-01-09 11:27:35 +05:30
Zarrar
0f458b1260 show balance if permitted to view gl entry (#12385) 2018-01-09 11:27:14 +05:30
tundebabzy
da22167741 Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382)
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.

* ui test cases

* cleanup
2018-01-09 10:58:44 +05:30
Vishal Dhayagude
d2d54826ab [minor] Minor Changes in Membership Doctype (#12384) 2018-01-09 10:56:17 +05:30
Pawan Mehta
5b069a4e25 Added Payment Details to Sales Payment Summary Report (#12358)
* [fix] #12357

* label changes
2018-01-09 10:53:13 +05:30
Sachin Mane
64f48db406 Batch number selector bug fix (#12346)
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"
2018-01-08 17:57:32 +05:30
Prateeksha Singh
8b94f1b553 [minor][buying] fix schedule date check (#12375) 2018-01-08 16:46:39 +05:30
rohitwaghchaure
7fcc21bc8b [Fix] Cart remain same even if pos profile change (#12371) 2018-01-08 15:22:22 +05:30
rohitwaghchaure
bf4c114c58 [Enhance] Provision to show inclusive tax in print (#12345)
* [Enhance] Provision to show inclusive tax in print

* POS Print format
2018-01-08 15:20:15 +05:30
Shreya Shah
44fa9a6d9d Last purchase rate button added back (#12135)
* last purchase rate button added

* triggers to update rate on button

* updated modified column in buying settings

* moved trigger to get_item_details.py

* hide get_last_rate button depending on buying settings
2018-01-08 14:58:20 +05:30
Prateeksha Singh
50b6d79758 Merge pull request #12370 from Zlash65/fix-root-node-delete
[Fix] Delete root node for account
2018-01-08 12:51:31 +05:30
Nabin Hait
3a972c4d85 Precision issue in stock reconciliation 2018-01-08 12:35:05 +05:30
Zlash65
745c2658eb delete root node allow 2018-01-08 11:53:52 +05:30
Manas Solanki
c82d7fb110 Merge pull request #12352 from ci2014/patch-1
Fix english typo in source code
2018-01-08 11:27:02 +05:30
Charles-Henri Decultot
57187860f8 Codacy error fixes 2018-01-06 15:32:01 +00:00
Charles-Henri Decultot
356839a54b Codacy erro fixes 2018-01-06 15:22:40 +00:00
ci2014
5d3e486415 Fix english typo in source code
Fix english typo in source code
2018-01-06 04:04:06 +01:00
Charles-Henri Decultot
34e335ba34 Prorated Asset Depreciation 2018-01-05 17:49:06 +00:00
Prateeksha Singh
620e0981cb Merge pull request #12347 from pratu16x7/buying-fix
[minor][buying] fix schedule date check
2018-01-05 21:31:58 +05:30
Prateeksha Singh
cbd06fd3c6 [minor][buying] fix schedule date check 2018-01-05 21:28:01 +05:30
Nabin Hait
54229ca66e Merge branch 'PawanMeh-fixes_8427' into develop 2018-01-05 18:21:40 +05:30
Nabin Hait
2f51c6900b Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:20:05 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb Fixed merge conflict 2018-01-05 14:15:39 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Nabin Hait
4702cc0368 Merge branch 'hotfix' 2018-01-05 13:16:59 +05:30
Nabin Hait
c98cfbdab4 bumped to version 10.0.6 2018-01-05 13:46:59 +06:00
Nabin Hait
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +05:30
James Robertson
46196c4ad3 Setup Wizard Updates (#12337)
Changes to support v10 ERPNext Setup Wizard
2018-01-05 12:50:04 +05:30
Saurabh
eac2e369cf [fix] setup alias for ifnull condition (#12327) 2018-01-05 12:48:08 +05:30
Doridel Cahanap
291b26ad04 Training Documentation in DE (#12309) 2018-01-05 12:47:40 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30
tundebabzy
8f44d1c63d Payment Terms in Delivery Note #12167 (#12293)
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.

* do nothing in payment_terms_template trigger if doctype is Delivery Note
2018-01-05 12:46:50 +05:30
Shreya Shah
48351e0339 cancelled sales invoice totals shouldn't be reflected in leaderboard for customer (#12292) 2018-01-05 12:45:43 +05:30
Manas Solanki
171157f1b3 Fix + Enhancement in Program Enrollment Tool (#12291)
* Fix + Enhancement in Program Enrollment Tool

* updated the docs
2018-01-05 12:42:39 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290)
* Companywise default tax template

* Fix test cases
2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49 [minor] POS profile mandatory, to set as default (#12307) 2018-01-05 12:26:33 +05:30
rohitwaghchaure
1f39feb12f [Fix] PO -> PI non default taxes not fetched (#12313) 2018-01-05 12:25:45 +05:30
rohitwaghchaure
c5c6f82623 [Hotfix] Tax rate not showing in the report (#12324) 2018-01-05 12:16:16 +05:30
Nabin Hait
42688f0636 Minor fix 2018-01-04 18:12:21 +05:30
Nabin Hait
941d0af13a Fixed organization lead error 2018-01-03 14:12:56 +05:30
Nabin Hait
76625b359e Removed naming series from set_only_once in pos profile 2018-01-03 14:03:53 +05:30
Manas Solanki
76ea7a9227 Merge pull request #12301 from kennethsequeira/cust-report-vid
Updated youtube video link for custom reports article
2018-01-02 21:53:47 +05:30
Kenneth Sequeira
82bd3302ee updated youtube video link for custom reports article 2018-01-02 21:41:48 +05:30
Saurabh
e9b37abfca Merge branch 'hotfix' 2018-01-02 12:09:25 +05:30
Saurabh
14506d7878 Merge branch 'master' into develop 2018-01-02 12:09:25 +05:30
Saurabh
abf5fa6bbb bumped to version 10.0.5 2018-01-02 12:39:25 +06:00
tundebabzy
650a1eeede recalculate terms when document date changed (#12288)
* recalculate terms when document date changed

* clean up
2018-01-02 12:02:30 +05:30
Nabin Hait
96b264b314 Minor fixes 2018-01-02 11:50:29 +05:30
Manas Solanki
15b880154a Merge pull request #12283 from kennethsequeira/cust-doc-img
Updated the image paths for Custom Doctype manual
2018-01-01 20:16:01 +05:30
Kenneth Sequeira
13e5689bd9 Updated the image paths for Custom Doctype manual 2018-01-01 17:33:57 +05:30
Saurabh
2ac1835f7d [fix] if is_root is true make parent account empty (#12255) 2018-01-01 16:17:43 +05:30
Saurabh
15d53c7912 [fix] key error (#12257) 2018-01-01 16:17:14 +05:30
Saurabh
9579645ae1 [fix] if item code exists then only call get_item_details (#12258) 2018-01-01 16:17:02 +05:30
Saurabh
a6b41e855b [fix] check if null for mode of payments (#12264) 2018-01-01 16:16:50 +05:30
rohitwaghchaure
526b0bc4e9 [minor] Code cleanup (#12278) 2018-01-01 16:16:16 +05:30
rohitwaghchaure
2640c7eec5 [Fix] Validation issue for online POS profile (#12276) 2018-01-01 16:15:41 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +05:30
Jamsheer
c90195de29 Patient medical record and Consulatation (#12198)
* Patient Medical Record - Subject field reqd=0, Subject text formated

* Consultation - remove patient details section

* Search fields are updated for Consultation and Appointment

* Translations applied on menu
2017-12-29 14:32:13 +05:30
Javier Wong
2469095a13 Check Meta before Toggling Conversion Factor (#12237)
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
2017-12-29 14:06:47 +05:30
Shreya Shah
df0dd8be5f Travis fix for client side tests (#12224)
* salary slip test fix

* attendance tool test fix

* timeout after routing
2017-12-29 14:04:46 +05:30
Nabin Hait
ddd5bf736b Merge branch 'master' into develop 2017-12-28 18:46:52 +05:30
Nabin Hait
da82674b47 Merge branch 'hotfix' 2017-12-28 18:46:51 +05:30
Nabin Hait
07be33805d bumped to version 10.0.4 2017-12-28 19:16:51 +06:00
rohitwaghchaure
a84d38999c [Fix] Sales order erased on production order on selection of sales order (#12225) 2017-12-28 18:45:27 +05:30
rohitwaghchaure
c9ed09440c Re-execute uae vat patch (#12230) 2017-12-28 18:42:22 +05:30
rohitwaghchaure
fe22686a8f Update last purchase rate from the purchase invoice (#12189) 2017-12-28 16:11:27 +05:30
Nabin Hait
b820174b18 Merge branch 'master' into develop 2017-12-28 14:22:59 +05:30
Nabin Hait
31d7433946 Merge branch 'hotfix' 2017-12-28 14:22:58 +05:30
Nabin Hait
c70a78dcf6 bumped to version 10.0.3 2017-12-28 14:52:57 +06:00
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise (#12202)
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
2017-12-28 14:20:13 +05:30
rohitwaghchaure
dbb5ae9a9e [fix] Closing balance showing at wrong side (#12220) 2017-12-28 13:15:21 +05:30
Nabin Hait
ca674bec42 Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
Saurabh
28ce1c0c3a [fix] add flag ignore mandatory (#12201) 2017-12-28 12:34:58 +05:30
Manas Solanki
91017cba8d Additional fields in the instructor doctype for the academics log and minor permission changes (#12204) 2017-12-28 12:34:36 +05:30
Frappe PR Bot
878b5f7e71 [Translation] Updated Translations (#12212) 2017-12-28 12:31:01 +05:30
Manas Solanki
e20a0f1115 [Fix] make PE unique for the combination of academic year and academic term (#12214) 2017-12-28 12:29:11 +05:30
Frappe PR Bot
efd9086579 [Translation] Updated Translations (#12212) 2017-12-28 11:49:37 +05:30
Fahim Ali Zain TP
5f7cedb206 Fix v8 to v10 migration issue (#12177) 2017-12-27 17:14:54 +05:30
Nabin Hait
ff2fb653be Merge branch 'develop' 2017-12-26 18:35:50 +05:30
Nabin Hait
a47ea94ab4 bumped to version 10.0.2 2017-12-26 19:05:49 +06:00
Nabin Hait
58384215b6 Merge branch 'hotfix' 2017-12-26 18:34:16 +05:30
Nabin Hait
9e16697702 Merge branch 'master' into develop 2017-12-26 18:34:16 +05:30
Nabin Hait
451af06d2f bumped to version 10.0.1 2017-12-26 19:04:16 +06:00
Nabin Hait
123759aff7 Fixes for travis (#12161)
* Fixes for travis

* Testcase fixes for get_item_details

* Testcase fixes for get_item_details

* Travis fixes

* Travis fixes
2017-12-26 17:50:34 +05:30
rohitwaghchaure
30e38ff7c7 [Fix] Asset make sales invoice (#12168) 2017-12-26 16:23:06 +05:30
Vishal Dhayagude
f06c281964 [fix] allow to change doc status on get items (#12174) 2017-12-26 16:22:40 +05:30
Manas Solanki
389b9a2be3 Merge pull request #12173 from manassolanki/fix-15
Minor fix
2017-12-26 15:43:19 +05:30
Manas Solanki
5e9d1246e8 remove the autoname from the supplier json 2017-12-26 15:21:03 +05:30
Nabin Hait
7e1dc0d724 Merge branch 'develop' 2017-12-25 15:24:49 +05:30
Nabin Hait
6211a3edf2 bumped to version 10.0.0 2017-12-25 15:54:48 +06:00
Nabin Hait
ed13b3c19a Fixed minor issue 2017-12-25 15:11:56 +05:30
Nabin Hait
c65279b584 Reloaded account doctype in UAE Vat patch 2017-12-25 15:02:54 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
Nabin Hait
537db4c2c7 Merge branch 'hotfix' 2017-12-25 13:38:06 +05:30
Nabin Hait
f4c5cf5bd0 bumped to version 9.2.24 2017-12-25 14:08:05 +06:00
Nabin Hait
e9dabd5cec Settings to show payment schedule in print (#12158) 2017-12-25 13:30:01 +05:30
Prateeksha Singh
293c700c08 Merge pull request #12157 from pratu16x7/setup-fixes
[setup] remove sample data commit, fix namespace
2017-12-25 12:31:23 +05:30
Prateeksha Singh
b61d091f4c [setup] remove sample data commit, fix namespace 2017-12-25 12:30:35 +05:30
Nabin Hait
9da6844b52 Version 10 change log 2017-12-25 12:25:52 +05:30
rohitwaghchaure
79f8784772 Merge pull request #12156 from rohitwaghchaure/company_setup_issue
[Fix] Setup wizard UAE/KSA
2017-12-25 12:12:57 +05:30
Rohit Waghchaure
cfafb21842 [Fix] Setup wizard UAE/KSA 2017-12-25 12:12:07 +05:30
tundebabzy
590bd0a8e5 trigger payment_terms_template only when needed (#12124) 2017-12-25 11:40:19 +05:30
rohitwaghchaure
bd5e01b09b [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134) 2017-12-25 11:28:07 +05:30
rohitwaghchaure
d8c6449f3a [Fix] Bom raw materials not in order in the stock entry (#12149) 2017-12-25 11:26:40 +05:30
rohitwaghchaure
75789b65c2 [Fix] Sales payment summary report (#12151) 2017-12-25 11:26:15 +05:30
Zarrar
adc184c872 [Minor] Fix adding child to root task issue (#12121)
* make parent_task none

* adding multiple tasks - set project of parent
2017-12-22 11:00:19 +05:30
rohitwaghchaure
443691aaf8 [Fix] Allow to change exchange rate in the payment entry if allow stale is enabled (#12128) 2017-12-22 10:59:01 +05:30
Ameya Shenoy
3909bd4e9f [agri] Disease task creation on new CropCycle fix (#12131) 2017-12-22 10:58:47 +05:30
Manas Solanki
5807cd8e6f Set the guardian role automatically. (#12136)
* Add the guardian role for parent portal

* invite guardian as user
2017-12-22 10:50:10 +05:30
Prateeksha Singh
6401678e63 Merge pull request #12141 from tundebabzy/fix-test-cases
[Minor] Fix typo
2017-12-22 10:00:14 +05:30
tunde
e3104938ff fix typo 2017-12-21 16:25:44 +01:00
Manas Solanki
45cb791878 Merge pull request #12130 from manassolanki/leaderboard
remove the print statements
2017-12-21 13:04:25 +05:30
Manas Solanki
1f4b530e68 remove the print statements 2017-12-21 12:57:43 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages (#12000)
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
2017-12-21 11:55:58 +05:30
Umair Sayed
82035c6c7a Update index.md (#12118) 2017-12-21 11:55:05 +05:30
Nabin Hait
e591c85f7c Payment schedule total amount validation considering write off amount 2017-12-21 11:47:08 +05:30
Nabin Hait
a5cc84f8af Reverted gl entry splitting based on payment terms (#12117)
* Reverted gl entry splitting based on payment terms

* changed modified date
2017-12-21 11:37:18 +05:30
rohitwaghchaure
174900506e [HotFix] Validation issue for subcontract stock entry (#12127)
* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py
2017-12-21 11:28:01 +05:30
Nabin Hait
2f9f4f9c01 Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +05:30
rohitwaghchaure
84da00da2f Allow to add items in manufacturing process which are not part of bom items (#12110) 2017-12-20 12:06:09 +05:30
Manas Solanki
8413f76c19 set the mandatory field in the backend (#12102) 2017-12-20 12:03:19 +05:30
Vishal Dhayagude
c8ecfa15f3 [new] Make Timesheet UX Added (#12100) 2017-12-20 12:02:34 +05:30
Ameya Shenoy
87b7844ae8 [Agri] Item amount set on item set (#12091)
* [Agri] Item amount set on item set

- closes #12008
- fixes #12010

* used frappe.call instead of frm.call in crop

* made modifications for sql query for BOM Item

- done since Crop doctype in Agri module also uses 'BOM Item' child table

* hide BOM no from BOM Item childtable in Crop
2017-12-20 12:00:24 +05:30
Prateeksha Singh
9a57049faa Merge pull request #12113 from pratu16x7/leaderboard
Add Leaderboard to desktop
2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c Add leaderboard to desktop 2017-12-20 10:51:25 +05:30
Saurabh
fb6912b38e Merge pull request #12101 from saurabh6790/patch_fix
[fix] set asset owner demo data
2017-12-19 14:56:19 +05:30
Saurabh
6386e9a1bd [fix] set asset owner demo data 2017-12-19 14:52:07 +05:30
tundebabzy
dbd068c44b Sales Order With Payment Terms Not Split In Payment Entry #12051 (#12065)
* validate schedule dates in non-invoice documents

* change query for orders

* take care of orders with/without payment schedule

* clean up, refactor, PEP8
2017-12-19 14:36:39 +05:30
Prateeksha Singh
41d2feab35 Merge pull request #12099 from pratu16x7/user-progress-items-fix
Create item price only if item created
2017-12-19 12:54:58 +05:30
Prateeksha Singh
3942cd353a create item price only if item created, fixes #12041 2017-12-19 12:53:39 +05:30
tundebabzy
90076bc3b5 Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12047)
* split journal entry according to invoice due date

* fix bug where reference_due_dates options are not populated:
- after making JE, add options to _onload
- use __onload to add options

* cater for case where no payment_schedule
2017-12-19 11:58:31 +05:30
Ameya Shenoy
6e5b8bb5d3 fixed logic for creating disease tasks (#12081) 2017-12-19 11:41:10 +05:30
tundebabzy
5825dedf7c Payment schedule error #12057 (#12096)
* use 12 places precision for sums

* use high float precision, fix decimal place late

* Update accounts_controller.py
2017-12-19 11:39:20 +05:30
Nabin Hait
f592f2c9a9 Revert "[Fix] Payment terms validation issue" (#12098)
* Revert "test fixed (#12094)"

This reverts commit dd700a550f.

* Revert "[fix] Column Heading in received item to be billed report (#12083)"

This reverts commit 7c57b6ecd8.

* Revert "[fix] Mobile no search issue in the pos (#12090)"

This reverts commit b725affe0c.

* Revert "[Fix] Payment terms validation issue (#12092)"

This reverts commit 9b8e1cb10e.
2017-12-19 11:31:34 +05:30
Shreya Shah
dd700a550f test fixed (#12094) 2017-12-19 11:24:07 +05:30
Vishal Dhayagude
7c57b6ecd8 [fix] Column Heading in received item to be billed report (#12083) 2017-12-19 11:23:34 +05:30
rohitwaghchaure
b725affe0c [fix] Mobile no search issue in the pos (#12090) 2017-12-19 11:21:00 +05:30
rohitwaghchaure
9b8e1cb10e [Fix] Payment terms validation issue (#12092) 2017-12-19 11:20:29 +05:30
Nabin Hait
33c9da9ab1 Patch to update due_date in GLE, Journal Entry and Payment Entry (#12093) 2017-12-19 11:18:36 +05:30
Shreya Shah
ec1cb79e5f Fetch employee advance in expense claim on adding it manually (#12069)
* added trigger on manually adding an advance

* improvised the query

* codacy fix

* updated
2017-12-18 18:06:01 +05:30
Zarrar
0acf687e20 Land unit tree (#12072)
* improvise tree structure

* remove set intro code

* remove all land units dependency

* test case corrected
2017-12-18 14:01:07 +05:30
Manas Solanki
2bca5a98ae add the data import icon in the desktop.py (#12062) 2017-12-18 13:55:30 +05:30
rohitwaghchaure
e067beda49 [fix] Promise issue, in cart against item displaying zero values (#12078) 2017-12-18 12:32:49 +05:30
Shreya Shah
d903bd6a70 patch fix for asset (#12079) 2017-12-18 12:31:23 +05:30
Nabin Hait
4c816a1054 Patch to set calculate_depreciation if schedule already exists (#12061) 2017-12-16 11:17:36 +05:30
rohitwaghchaure
e3b5c0f727 [fix] Regional print format showing for other countries users (#12045) 2017-12-16 10:53:53 +05:30
rohitwaghchaure
938a1fee80 [minor] Tax id of supplier not fetching in purchase invoice (#12052) 2017-12-16 10:51:07 +05:30
Kenneth Sequeira
9bceb388c8 changed dead YouTube link for videos (#12053) 2017-12-16 10:50:29 +05:30
rohitwaghchaure
1bc47fa43c [fix] Sales order tax not fetching on the sales invoice (#12055) 2017-12-16 10:49:58 +05:30
Ameya Shenoy
eb8446f01f Agri fixes (#12033)
* crop_cycle, moving point in geojson from js to py

* crop fields are fetched into crop_cycle

- fixes #12011

* area is a readonly field

- fixes #11994

* [agri] land unit child geojson bug fixed

* set_intro null if parent field entered, list only group nodes

* minor fixes
2017-12-16 10:43:35 +05:30
Nabin Hait
2a9dc9019a Fixed closing debit/credit in general ledger report 2017-12-15 19:41:20 +05:30
Prateeksha Singh
228c341d12 [setup-progress] Rerun letterhead slide patch 2017-12-15 18:32:27 +05:30
Nabin Hait
2afcff1852 Get outstanding invoices on payment entry 2017-12-15 17:32:03 +05:30
Nabin Hait
b9ca91a832 Update company.py 2017-12-15 17:23:11 +05:30
Faris Ansari
c7b92b73a6 fix patches for v7 sites (#12043) 2017-12-15 16:49:11 +05:30
Manas Solanki
53e47e6ba5 frappe call only if item code or serial no is ther (#12036) 2017-12-15 15:47:52 +05:30
Nabin Hait
13435dddcc BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE 2017-12-15 15:46:43 +05:30
rohitwaghchaure
78a17355be [fix] Item search in POS (#12037) 2017-12-15 15:38:12 +05:30
Nabin Hait
6a640b78c4 Minor fixes in payroll entry and opening invoice tool 2017-12-15 15:34:14 +05:30
rohitwaghchaure
5a344576b8 [minor] Address fix (#12025) 2017-12-15 13:14:36 +05:30
Nabin Hait
9771b9376d Merge branch 'master' into develop 2017-12-15 12:53:56 +05:30
Nabin Hait
d257af910b Merge branch 'hotfix' 2017-12-15 12:53:55 +05:30
Nabin Hait
2f22d2b307 bumped to version 9.2.23 2017-12-15 13:23:54 +06:00
rohitwaghchaure
ce8adecbad Incoming rate fixes (#11986) 2017-12-15 12:13:50 +05:30
Jignesh Greycube
7f13283b66 Renamed Tax Breakup Label to In Words (#12016)
Detailed Invoice  Print format, Renamed "Tax Breakup" Label  to "In Words"
2017-12-15 11:59:30 +05:30
tundebabzy
1d459c4327 Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12019)
* don"t summarise due_dates query

* reference_due_date to fetch outstanding based on due date

* use if else so that no need to do useless checks

* clear debit and credit fields before fetching outstanding

* grid keeps forgetting drop down so add to options

* clear debit and credit fields before fetching outstanding properly
2017-12-15 11:29:27 +05:30
Vishal Dhayagude
d377018695 [fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001)
* [wip] shipping rule

* [wip] Shipping Rule tax auto calculate

* [wip] Shipping Rule

* [new] Shipping charges change on different triggers

* [minor] Removed unnecessary comments

* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
Pawan Mehta
d6cb617520 Fix 11948 - Sales Payment Summary (#11950)
* [fix] #11948

* [fix] #11948

* [fix] #11948

* codacy issues
2017-12-14 18:04:31 +05:30
Nabin Hait
6b0d4bd01b Minor fixes related to employee advance 2017-12-14 18:03:10 +05:30
Saurabh
65b3356dee [fix] merge case in rename_translated_domains_in_en #11879 (#12007) 2017-12-14 16:52:50 +05:30
rohitwaghchaure
2b95a5438b POS batch fixes (#12005) 2017-12-14 16:06:23 +05:30
Vishal Dhayagude
ee7b4f00f8 [minor] Chapter head link with Member (#12003) 2017-12-14 13:26:22 +05:30
Nabin Hait
d0249b0880 Employee advance (#11875)
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
tundebabzy
02b4b5f526 Payroll Entry (#11936) (#11968)
* add functions for tracking related salary slips

* PEP 8 style

* put buttons into Make based on context

* add function to test for bank entry journal

* refeactor `add_bank_entry_button`

* "View Salary Slips" made a standalone secondary button

* set_inner_btn_group for Make Bank Entry

* refresh button after journal is submitted

* edit javascript test case

* codacy

* fix as per review

* no longer use $c
2017-12-14 13:15:28 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number (#11998)
* [enhance] Search customer using primary contact mobile number

* Update build.json
2017-12-14 13:06:21 +05:30
Shreya Shah
a2cfd97cd7 fetch party name (#11985) 2017-12-14 12:42:01 +05:30
Umair Sayed
4667cb2f62 Update implementation-strategy.md (#12002) 2017-12-14 12:21:47 +05:30
Zarrar
6e0acbe4d0 Patch to copy old field data to new field (#11997)
* patch to copy old fields data to new ones

* fix for patches related to project

* use rename_field function, copy if only field present
2017-12-14 12:21:00 +05:30
rohitwaghchaure
5759258dcf [fix] Added total closing in general ledger (#11961) 2017-12-13 18:57:37 +05:30
rohitwaghchaure
40f5d8edd4 [fix] Pull subcontracted item if subassembly is not defined (#11996) 2017-12-13 18:51:05 +05:30
Ameya Shenoy
cc05c0b348 Agri fixes (#11988)
* minor fixes in agri

* updated desktop.py

* [agri] fixed recreation of dotypes in setup.py

* setup_wizard changes

- converted agriculture from alpha to beta
- rearranged the domains alphabetically

* [agri] linked doctype is collapsible
2017-12-13 18:50:39 +05:30
Shreya Shah
8cad3f12a2 Salary Slip not updating when adding/removing Timesheet links (#11982)
* timesheet on salary slip

* changes

* cal total wages

* calculate gross_pay and net_pay

* codacy fix
2017-12-13 18:43:01 +05:30
Nabin Hait
aaf378e340 Validate numeric attribute value based on range defined in template (#11981) 2017-12-13 18:40:52 +05:30
Zarrar
de8f6120f3 [Fix] Restrict domain specific roles (#11975)
* restrict roles to its specific domain

* missing hook for Non Profit
2017-12-13 18:36:08 +05:30
rohitwaghchaure
659b46832c [fix] Patch (#11976) 2017-12-13 18:35:22 +05:30
Saurabh
aa66fa17d7 key fix in demo setup completion (#11980) 2017-12-13 18:34:43 +05:30
Manas Solanki
56f5b5f75c Update the desktop.py (#11974)
Remove the data import desktop icons
2017-12-13 11:28:18 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Nabin Hait
96d6498226 Merge branch 'hotfix' 2017-12-12 19:17:51 +05:30
Nabin Hait
66456dae34 bumped to version 9.2.22 2017-12-12 19:47:51 +06:00
Zarrar
21ea6cdb91 batch.expiry should be sorted in ascending order too (#11960) 2017-12-12 18:54:17 +05:30
Nabin Hait
af9bdfeaa3 Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965) 2017-12-12 18:50:05 +05:30
Nabin Hait
aab1182c73 Update stock_entry.js 2017-12-12 18:45:39 +05:30
Pawan Mehta
bb7fab52d1 [fix] #11880- Item wise report showing price list and stock available (#11885)
* [fix] #11880

* review comments

* codacy fixes
2017-12-12 15:05:03 +05:30
KanchanChauhan
34ed1df9ef [Minor] Update Status based on Asset Maintenance and Asse Repair (#11886) 2017-12-12 15:03:21 +05:30
Charles-Henri Decultot
d18423d9c7 Project Margin Calculation Improvement (#11911)
* Project Margin Calculation Improvement

* Documentation modification

* Change Total Planned Sales to Total Sales Amount

* Change documentation screenshot
2017-12-12 14:59:59 +05:30
Maxwell Morais
d06b7049c7 Allow manufacturing order from SO with Packed Items that contains BOM's (#11947) 2017-12-12 14:46:16 +05:30
rohitwaghchaure
4e17fae63b [enhance] UAE/KSA VAT/Excise implementation (#11923) 2017-12-12 14:40:52 +05:30
Shreya Shah
ea723e59c6 POS Profile validation message rephrased (#11934)
* pos validation message improvised

* removed unused field
2017-12-12 14:24:00 +05:30
Shreya Shah
db499dcaa4 fixed fiscal dates (#11939) 2017-12-12 14:19:35 +05:30
tundebabzy
f628184c68 Error in Opening Invoice creation Tool (#11938) (#11941)
* add qty field

* cast qty to float

* PEP8 compliance
2017-12-12 14:19:07 +05:30
tundebabzy
ff1b875661 Improve Validation Message in the Payroll Entry (#11937) (#11944)
* change error message from `create_log`

* PEP 8 compliance
2017-12-12 14:18:14 +05:30
rohitwaghchaure
47749f4635 [fix] Cur_frm breaking offline pos (#11955) 2017-12-12 14:16:03 +05:30
Manas Solanki
6a415bd32d set desktop icons (#11953) 2017-12-12 13:24:13 +05:30
Nabin Hait
de1e29bf1b Production Order fixes (#11951)
* Production Order from Sales Order fixes: Validate SO and set required items on save

* Codacy fixes
2017-12-12 13:22:48 +05:30
Prateeksha Singh
903e9f4b6f Merge pull request #11943 from pratu16x7/hub-connector-fixes
[fix] hub connection, fixes #11357
2017-12-11 23:23:37 +05:30
Prateeksha Singh
1126a43979 [fix] hub connection, fixes #11357 2017-12-11 23:22:30 +05:30
pawan
1892454036 Add Total Row 2017-12-11 17:48:56 +05:30
KanchanChauhan
3ca00c7143 Items should not be used from Sample Retention warehouse (#11905) 2017-12-11 14:59:19 +05:30
rohitwaghchaure
d19be49889 [fix] Error opening the POS (#11929) 2017-12-11 14:57:43 +05:30
Shreya Shah
1b30642362 cal difference amount when qty 0 (#11925) 2017-12-11 14:56:57 +05:30
rohitwaghchaure
efbc0667ec [fix] On change of payment terms template, not fetch respective schedule data (#11928) 2017-12-11 14:54:20 +05:30
rohitwaghchaure
505661b5c0 [fix] Wrong company's default tax fetch (#11927) 2017-12-11 14:52:28 +05:30
Giovanni
da40999ed8 - fix patch 2017-12-11 10:01:45 +01:00
Giovanni
dd37ceb707 patch to migrade barcodes into Item Barcode 2017-12-11 09:54:18 +01:00
Manas Solanki
3fe59b4443 remove the unnecessery files (#11922) 2017-12-11 13:01:27 +05:30
KanchanChauhan
236ac5eb38 [Fix] Customer and Address blank if does not exist in Delivery Stops (#11895) 2017-12-11 12:38:30 +05:30
KanchanChauhan
7f8df06663 [Minor]Removed alert=true from frappe.throw (#11904) 2017-12-11 12:24:43 +05:30
Prateeksha Singh
0419e2384d reinitialize variant attribute table, fixes #11900 (#11921) 2017-12-11 12:22:28 +05:30
Giovanni
43372d3333 - make barcode mandatory if child row is added
- check valid barcode only if exists
2017-12-10 20:56:48 +01:00
Giovanni
ff7d73e418 - query fix 2017-12-10 20:46:46 +01:00
Giovanni
2a098ada7c - bug fix 2017-12-10 20:33:20 +01:00
Giovanni
4c848ee14f - codacy fix 2017-12-10 20:06:56 +01:00
Giovanni
8f8a485e07 - autoname field:barcode 2017-12-10 19:46:01 +01:00
Giovanni
ff6d0a5260 - clean code - console logs 2017-12-10 19:36:42 +01:00
Giovanni
01953135c5 - code clean 2017-12-10 18:54:19 +01:00
Giovanni
a04c756913 - validate EAN or UPC-A code
- made Item Barcode Doctpye standard
- added stdnum to requirements
2017-12-10 18:54:08 +01:00
Giovanni
9b7e52cafb - added barcode validation against Item Barcode 2017-12-10 18:11:48 +01:00
Giovanni
2144e02d3c - Added multiple barcode feature per item 2017-12-10 17:27:09 +01:00
Nabin Hait
d10014bdeb minor fix in fetching payment terms template 2017-12-08 16:51:53 +05:30
Asharam Seervi
98d5878aa2 Added Column Break in Item Master (#11887)
* Fixed: On Item form, added cb.

* Fixed: On Item form, added cb.
2017-12-08 16:18:23 +05:30
Shreya Shah
6b64947f47 Route to Payment Entry instead of Journal Entry in paid Expense Claim (#11874)
* route fixed

* improvised
2017-12-08 16:14:23 +05:30
Zarrar
17fd6610dc Fix travis (#11882)
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
2ba198ec70 improvise query (#11878) 2017-12-08 11:35:53 +05:30
Vishal Dhayagude
6d250f8789 [fix] Missing value Net Weight Added in Calculate Based On select field (#11883) 2017-12-08 11:35:18 +05:30
Shreya Shah
88dbc26a98 replace process payroll (#11873) 2017-12-07 18:24:42 +05:30
Zarrar
5ee5d43295 ontrash of nestedset wasn't ideal for employee's usecase (#11876) 2017-12-07 17:16:59 +05:30
Ameya Shenoy
396feba874 agri_docs fix links (#11870) 2017-12-07 12:53:57 +05:30
Nabin Hait
4cad7fc36c Fixed Merge conflict 2017-12-07 12:04:19 +05:30
Nabin Hait
84a44f7758 Merge branch 'hotfix' 2017-12-07 12:03:40 +05:30
Nabin Hait
6674ba8bd1 bumped to version 9.2.21 2017-12-07 12:33:40 +06:00
Nabin Hait
5de499e5d5 Minor cleanups 2017-12-07 12:01:06 +05:30
pawan
271b7cd4f9 codacy issues 2017-12-07 12:01:00 +05:30
pawan
19f09b0b69 fix codacy issues 2017-12-07 12:00:06 +05:30
pawan
d8e91982ca Fixed Merge conflict 2017-12-07 12:00:01 +05:30
Ameya Shenoy
e0d461c2eb [Agriculture] documentaion (#11867) 2017-12-07 11:53:12 +05:30
Doridel Cahanap
9f7e109c3e [minor] Fix Delivery Trip Error (#11868) 2017-12-07 11:52:33 +05:30
Nabin Hait
4cfbeebdef Merge branch 'shreyashah115-payroll_entry' into develop 2017-12-06 19:56:11 +05:30
Nabin Hait
97b8a7b237 Minor fixes in payroll entry 2017-12-06 19:55:57 +05:30
Nabin Hait
bb09437d1f Merge branch 'develop' into payroll_entry 2017-12-06 19:18:40 +05:30
Shreya Shah
b13a54ac74 Checkbox in Price list for Price not UOM dependant (#11836)
* checkbox price not uom dependant

* change price list rate on uom dependancy condition

* test case

* Update get_item_details.py
2017-12-06 19:17:03 +05:30
KanchanChauhan
f6aff3de96 [New Feature] Sample Retention from a Batch of item recieved (#11624) 2017-12-06 18:38:01 +05:30
Ameya Shenoy
5c62368a65 [Agriculture Domain] (#11663)
* created Soil Analysis, Water Analysis, Weather and Fertilizer doctype

* soil doctype edited and crop doctype added

* minor stuff

* Land Unit + Leaflet

* crop cycle added

* Land Unit changes + Crop cycle

* autoname for plant_analysis

* created Agriculture Task

* minor stuff

* - deleted agriculture_task
- current state after the call

* [Agriculture] modified fertilizer doctype to have a link to Item
This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes

* Added fields to `Water Analysis` doctype
- Collection Datetime
- Laboratory Testing Datetime
- Results Datetime (default to Laboratory Testing Datetime)

* Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture`
- Created `agriculture task` doctype
- added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype
- edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module

* Recursively reflect child land unit feature changes on parents

* fixed feature repition bug

* added legeneds to ternary plot

* added stuff

* changes

* fix Task

* reverted the Task Doctype to have naming in the form TASK.#####

* fixed modifications made to TASK doctype

* [dirty commit] added auto create Task from Crop on creation of Crop Cycle

* Changed the Crop Cycle Doctype
- Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle"
- Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle
- Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle

* [Agriculture Module] Modifications
- Created childtable doctype "Pest Detected"
- Added childtable "Pest Detected" to Pest
- Modified "Agriculture Task" to include "Start Day" and "End Day" of task
- Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle

* [Agriculture Module] fixed Pest doctype not saving issue

* [Agrcilture Module] Changes in Crop Cycle
- removed the creation of a master task on creation of a new crop cycle
- temporary fix to add the pest tasks from the pests added in crop cycle

* land_unit_tree.js fields modified to have field objects instead of just field names

* Revert "land_unit_tree.js modified"

* land_unit_tree.js fields modified to have field objects instead of just field names

* [Agriculture Domain] Converted Agriculture Module to a Domain
- Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype
- Agriculture (alpha) is now a Domain

* land_unit area aggregation enabled

* land_unit.py checks feature diff for every ancestor and not just the parent

* Removed unnecessary print messages

* agriculture.py modified to include fixtures

* fixtures added to setup.py inside agriculture module

* [Agriculture Domain] UI tests added
- 'materials' table renamed to 'materials_required' in 'Crop'
- wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture
- moved creation of tasks from client side to server side in Crop Cycle
- Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively
- company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms'

* [Agriculture Domain] Mostly written server side tests and moved client side code to server side
- moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture,
- wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest
- NOTE: none of the server side codes were tested

* [Agriculture Domain] All server side tests working locally

* [Agriculture Domain] Testing
- added sample test for Land Unit, which needs to be modified to test multiple things
- modified tests to be independant of each other

* Land Units tests added and area aggregation code migrated to server side

* added land_unit server side tests and on_trash added to land_unit

* Changing field location for start date

* [Agriculture Domain] deleted unnecessary comments

* [Agriculture Domain] reverted changes

* [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype
- Deleted the Pest doctype and replaced it with the more generic Disease doctype
- Deleted the Detected Pest doctype and replaced it with Detected Disease doctype

* [Agriculture Domain] resolves #11654, resolves #11653

* [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit
- not working perfectly yet
- docs are fetched but not appended

* [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional

* [Agriculture] added seperate stage for client side agriculture tests

* [Agriculture] minor modification to crop_cycle.js test

* [Agriculture] fixed tests

* upgrade chromedriver in .travis.yml from 2.32 to 2.33

* [Agriculture] added land unit ui test

* [Agriculture] added Agriculture server side test as a seperate stage in travis

* tesing travis.yml

* [Agriculture] Crop Cycle is able to fetch linked analysis docs

* Modified travis.yml for modular server side testing

* [minor fix][Agriculture] in soil_texture

- fixed multiple soil_texture ternary plot creation on refresh
- fixed error on soil composition change

* Update .travis.yml

* removed location field from linked doctypes

* minor fixes and cleanup of agri

* minor fix in agriculture and domain patches

* permissions added to agriculture

- Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes

* [Agriculture]

- Created Agiculture Analysis Criteria and added sample records to it
- All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria
- Also Fertilizer does the same
  This was introduced so that, new parameters could be added on demand

* minor changes requested in Agriculture

* minor changes

* minor fix

* Update desktop.py

* Update .travis.yml
2017-12-06 18:36:27 +05:30
Vishal Dhayagude
b930dfa74c [fix] fix patch failed erpnext/patches/v7_2/make_all_assessment_group.py (#11864) 2017-12-06 18:03:21 +05:30
Vishal Dhayagude
d4e439906c [fix] Modification in Non Profit docs (#11862) 2017-12-06 18:02:31 +05:30
Prateeksha Singh
11e27b2990 Merge pull request #11865 from Zlash65/fix-setup
[Minor] Setup-wizard fix
2017-12-06 17:13:44 +05:30
Zlash65
5fc8923322 fix setup-wizard leftovers 2017-12-06 17:04:03 +05:30
Nabin Hait
c84476bd27 Fixed merge conflict 2017-12-06 14:17:51 +05:30
Nabin Hait
7ff6e378dd Merge branch 'hotfix' 2017-12-06 14:17:14 +05:30
Nabin Hait
7de5d3bb1d bumped to version 9.2.20 2017-12-06 14:47:13 +06:00
Manas Solanki
a160879159 set the reference document in the payment entry while creating from fees (#11861)
* set the reference document in the payment entry while creating from fees

* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
Prateeksha Singh
7351709980 [multicheck] Select multiple domains in setup (#11709)
* [multicheck] select multiple domains in setup

* use multiple domains in make_sample_data

* revert to setting in domains child table

* domains slide validation

* update setup wizard test
2017-12-06 13:28:06 +05:30
rohitwaghchaure
1b16bca843 [minor] Escape special characters (#11855) 2017-12-06 13:16:06 +05:30
tundebabzy
6a418f2a9b change Purchase Taxes and Charges default to 'Total' (#11857) 2017-12-06 13:15:33 +05:30
rohitwaghchaure
d52c64ff11 [fix] Show total for opening and closing dr/cr (#11860) 2017-12-06 13:14:28 +05:30
Nabin Hait
cd477fc187 Merge branch 'vishdha-non_profit2' into develop 2017-12-06 12:58:20 +05:30
Nabin Hait
51ce1027de non-profit module cleanups 2017-12-06 12:58:04 +05:30
Nabin Hait
419db49806 non-profit module cleanups 2017-12-06 12:57:53 +05:30
Vishal
54f5b115a7 [new] Role added 2017-12-05 17:51:15 +05:30
Vishal
474d58cecf [fix] minor changes 2017-12-05 17:19:02 +05:30
Vishal
5ffbd4f492 [fix] Reviewed Modification in Grant Application 2017-12-05 16:41:09 +05:30
Vishal
91236fa9d6 [fix] Reviewed modification on donor and volunteer 2017-12-05 16:41:09 +05:30
Vishal
139545a0f7 [fix] Minor changes in membership 2017-12-05 16:41:09 +05:30
Vishal
74116172b8 [fix] Reviewed Chapter Doctype Modification 2017-12-05 16:41:09 +05:30
Vishal
debc93c58a [new] Non Profit Domain patch added 2017-12-05 16:41:09 +05:30
Vishal
5ade836713 [new] Non Profit Documentation Modified 2017-12-05 16:41:09 +05:30
Vishal
7e50bf3674 [fix] Minor changes in patch set member as party type 2017-12-05 16:41:09 +05:30
Vishal
55480491bf [minor] changes added in member and membership doctype 2017-12-05 16:41:09 +05:30
Vishal
5a4611df95 [fix] fetch expiary date from membership to member doctype 2017-12-05 16:41:09 +05:30
Vishal
0dbf00a283 [fix] Minor changes in grant application 2017-12-05 16:41:09 +05:30
Vishal
344f5d9cd6 [fix] Minor changes in grant_application.html 2017-12-05 16:41:09 +05:30
Vishal
155ec4ba58 [new] Grant application doctype clean up after review 2017-12-05 16:41:09 +05:30
Vishal
74fb550a70 [new] sidebar added on chapter web page 2017-12-05 16:41:09 +05:30
Vishal
a72a3bd536 [new] Chapter Module clean up after review 2017-12-05 16:41:09 +05:30
Vishal
fe0c6c8e28 [fix] Non Profit Domain clean up after review 2017-12-05 16:41:09 +05:30
Vishal
a68234d345 [new] Fontawesome icon added 2017-12-05 16:41:09 +05:30
Vishal
fca5cfe986 [fixed] Codacy fixed 2017-12-05 16:41:09 +05:30
Vishal
397a8761f7 [new] Convert Non Profit Module into Non Profit Domain 2017-12-05 16:41:09 +05:30
Vishal
43977a1422 [fix] Minor Changes in grant_application.py 2017-12-05 16:41:09 +05:30
Vishal
fa8f762805 [fix] Grant Application Url added in message body on sendmail 2017-12-05 16:41:09 +05:30
Vishal
da05b3ce7f [fix] Modified Grant Application Test 2017-12-05 16:41:09 +05:30
Vishal
b4a8e11edc [new] Account table added in Grant Application 2017-12-05 16:41:09 +05:30
Vishal
1a88562ef9 [new] Assessment Manager for grant Review, web portal added 2017-12-05 16:41:09 +05:30
Vishal
7c7c3522cb [new] Codacy fixed 2017-12-05 16:41:09 +05:30
Vishal
a6a302f8a6 [new] Grant Application Web Form Added 2017-12-05 16:41:09 +05:30
Vishal
6a4fd7d89e [fix] UI Test 2017-12-05 16:41:09 +05:30
Vishal
788f41707e Chapter Message Link field added 2017-12-05 16:41:09 +05:30
Vishal
5cd70bed25 [new] Test Cases Added for Non Profit 2017-12-05 16:41:09 +05:30
Vishal
86140c8659 [fix] Codacy Issue 2017-12-05 16:41:09 +05:30
Vishal
f86984c785 [fix]travis build issue 2017-12-05 16:41:09 +05:30
Vishal
d051921ff8 [fix] Codacy issue 2017-12-05 16:41:09 +05:30
Vishal
722c06e819 [fix] travis 2017-12-05 16:41:09 +05:30
Vishal
1ebdeacee3 UI Test Added for Membership Type 2017-12-05 16:41:09 +05:30
Vishal
1c5bf8e3ca modified index.md 2017-12-05 16:41:09 +05:30
Vishal
d5d0813b2d [new] Modified Doctypes for list view 2017-12-05 16:41:09 +05:30
Vishal
2c9ce190eb [new] Grant Application Doctype Added 2017-12-05 16:41:09 +05:30
Vishal
18ac423c47 [new] Volunteer skills and Availability Added 2017-12-05 16:41:09 +05:30
Vishal
7525bc6f1d [new] Doctype Donor and Volunteer Added 2017-12-05 16:41:09 +05:30
Vishal
b4d73cbda0 [fix] Imported getdate in erpnext 2017-12-05 16:41:09 +05:30
Vishal
546130c046 Documentation added for Non Profit 2017-12-05 16:41:09 +05:30
Vishal
b4cda1b4a1 [fix] Address field removed in Member 2017-12-05 16:41:09 +05:30
Vishal
10608e8c65 [fix] Removed address field in Member doctype 2017-12-05 16:41:09 +05:30
Vishal
e01846051d Membership Type shows under memberhip section 2017-12-05 16:41:09 +05:30
Vishal
3a75a5e9b5 New Party Type Member Added 2017-12-05 16:41:09 +05:30
Vishal
5dae126f56 Membership Doctype Added 2017-12-05 16:41:09 +05:30
Vishal
cc06d291c6 link member in dynamic link table 2017-12-05 16:41:09 +05:30
Vishal
50f13e17a7 [new] Chapter Doctype Added 2017-12-05 16:41:09 +05:30
Vishal
ca61453fa3 [new] Non Profit module Added 2017-12-05 16:41:09 +05:30
Zarrar
a263ff2842 chromedriver update (#11849) 2017-12-04 19:29:16 +05:30
rohitwaghchaure
3a5ca927e7 [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category (#11848)
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category

* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Zarrar
c47745ea83 only fetch distinct names of events (#11846) 2017-12-04 19:23:20 +05:30
Kenneth Sequeira
406cb920ae Documentation Update (#11844)
* Delete payment-tool.md

* Update index.txt

Removed Payment Tools from Index

* Update index.txt

removed barcode setup from index

* Delete barcode-1.png

removed barcode-1.png

* Delete barcode-2.png

* Delete bar-code.md

removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.

* Delete bar-code.md

removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.

* Update index.txt

remove bar-code set up link from index de (german)

* Update index.txt

remove bar-code set up link from index de (german)
2017-12-04 19:22:50 +05:30
Manas Solanki
e6fd07fda9 Changes in the Fee structure (#11842)
* academic year non mandatory in the fee structure and minor changes

* update the docs
2017-12-04 19:21:50 +05:30
Shreya
e570e4a049 fixed a test 2017-12-04 16:49:44 +05:30
Shreya
f8e7bc7c5b removed process payroll doctype 2017-12-04 16:49:44 +05:30
Shreya Shah
db332f2c08 employee_details table added 2017-12-04 16:49:44 +05:30
Shreya
9956f15c80 added py test 2017-12-04 16:49:44 +05:30
Shreya
b5dff03453 added changes from process payroll 2017-12-04 16:49:44 +05:30
Shreya
d1defa5fc7 set salary components 2017-12-04 16:49:44 +05:30
Shreya
d73dd056d6 test case 2017-12-04 16:49:44 +05:30
Shreya
7b2870431e new doctype payroll_entry 2017-12-04 16:49:44 +05:30
rohitwaghchaure
58ae5ee563 Merge pull request #11843 from shreyashah115/bugf
Travis fix for asset and delivery trip tests
2017-12-04 16:35:30 +05:30
Shreya
eba3f39bbe test delivery trip fix 2017-12-04 16:04:56 +05:30
Shreya
3febe0215e test asset fix 2017-12-04 16:04:42 +05:30
Shreya Shah
8ee1ea456d travis fix (#11841) 2017-12-04 14:28:02 +05:30
Nabin Hait
a11dcb6e59 Pull items in Stock Entry from Purchase Invoice (#11839) 2017-12-04 13:36:50 +05:30
rohitwaghchaure
148fccd45a [Fix] Wrong value showing in the email digest (#11840) 2017-12-04 13:36:01 +05:30
Manas Solanki
3bac586ee2 fix in the assessment result tool while entering the zero marks (#11837) 2017-12-04 12:55:10 +05:30
tundebabzy
3061fc92fd Batch Stock Items, having serial number can't be moved without inserting Serial Number (#11792) (#11813)
* if doctype is batch, add extra information to args

* automatically fetch serial numbers if possible

* take advantage of changes in make_stock_entry

* code clean up

* PEP 8 compliance

* fix bug that clears serial number
2017-12-04 11:23:21 +05:30
Zarrar
5e470f757f [Fix] Filter on child table not working in Calendar (#11824)
* use the new get_events method

* using the common get_events method for calendar_view

* using add_fetch to fill customer_name
2017-12-04 11:22:25 +05:30
Charles-Henri Decultot
8a052cb153 Translation issue (#11833) 2017-12-04 11:17:05 +05:30
vwithv1602
78d5ccf5fc Invalid return against purchase invoice Error - Issue#11834 (#11835) 2017-12-04 11:16:34 +05:30
tundebabzy
1fb285c165 hide html example in print (#11830) 2017-12-04 11:13:36 +05:30
Shreya Shah
11938a47ec fixed typo (#11825) 2017-12-01 17:38:26 +05:30
pawan
990277a0de patch 2017-12-01 16:45:47 +05:30
Saurabh
d505d83cb6 [fix] merge conflicts 2017-12-01 16:23:46 +05:30
Saurabh
b36dc5e906 Merge branch 'hotfix' 2017-12-01 16:22:43 +05:30
Saurabh
a067ddbc20 bumped to version 9.2.19 2017-12-01 16:52:43 +06:00
Charles-Henri Decultot
e90a1caeb1 Portal print format correction (#11812)
* Portal print format correction

* Correction following Rushabh's comment
2017-12-01 16:19:45 +05:30
Kenneth Sequeira
9e27b347ca Delete payment-tool.md (#11820)
* Delete payment-tool.md

* Update index.txt

Removed Payment Tools from Index
2017-12-01 16:17:53 +05:30
KanchanChauhan
8380253178 On changing assign_to assign maintenance task in Asset Maintenance (#11804) 2017-12-01 16:14:05 +05:30
Jamsheer
f4d9af1ab9 Fix Patch - remove company from patient (#11819) 2017-12-01 16:10:39 +05:30
rohitwaghchaure
b1ac979ac5 [fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no (#11817) 2017-12-01 16:09:02 +05:30
pawan
14d570ed9e fix 2017-11-30 18:41:09 +05:30
pawan
2ff844e740 default warehouse / remove validation / change sql 2017-11-30 18:14:55 +05:30
Nabin Hait
7a294e6ef5 Update asset_category.json 2017-11-30 18:02:22 +05:30
Nabin Hait
5e801955f1 Update asset_category.json 2017-11-30 18:01:56 +05:30
Saurabh
34a0e90115 [fix] merge conflicts 2017-11-30 16:45:01 +05:30
Saurabh
aa25e95510 Merge branch 'hotfix' 2017-11-30 16:41:46 +05:30
Saurabh
f9509a084a bumped to version 9.2.18 2017-11-30 17:11:46 +06:00
Nabin Hait
1b89be0c66 Fixed rounding issue in subcontracting (#11802) 2017-11-30 15:59:56 +05:30
rohitwaghchaure
e34ef60e3e [fix] Asset test cases and added make_sales_invoice (#11800)
* [fix] Asset test cases and added make_sales_invoice

* vehicle trip test cases
2017-11-30 15:59:40 +05:30
Faris Ansari
ec3be9eebf [hotfix] Party Type name (#11797) 2017-11-30 15:53:39 +05:30
Nabin Hait
c5e0d22464 Update set_delivery_date_in_so_item.py 2017-11-30 15:52:47 +05:30
pawan
e4aaff6686 message changes 2017-11-30 15:49:54 +05:30
pawan
f5bb2af92c test case 2017-11-30 15:20:00 +05:30
Nabin Hait
e761b9de40 Rearranged fields due to merge conflict messup 2017-11-30 14:29:10 +05:30
Vishal Dhayagude
8677cd1565 [patch] Patch added to rename net_weight field (#11798) 2017-11-30 13:52:30 +05:30
pawan
e43cd915e8 alignment 2017-11-30 12:31:32 +05:30
pawan
abc5523405 code improvements 2017-11-30 12:23:46 +05:30
Manas Solanki
f9cc56cd62 minor fixes in the assessment result tool (#11795) 2017-11-30 11:39:06 +05:30
tundebabzy
ce63ab7602 Show Batch Selector Dialog Only If There Are Multiple Batches (#11794)
* check if multiple batches available before showing dialog

* Update point_of_sale.js
2017-11-30 11:38:53 +05:30
tundebabzy
8ae53cacc5 When Warehouse Field Is Changed, Batch Number Field Should Be Updated (#11789) (#11790)
* reset batch_no field if no batch number returned

* on warehouse change, query for batch number
2017-11-30 11:37:21 +05:30
rohitwaghchaure
2d48cc0aa9 Merge pull request #11786 from shreyashah115/fix-json
Fixed json affected by latest merge
2017-11-30 10:13:48 +05:30
pawan
11398fd572 Validation for reserved warhouse 2017-11-29 21:16:02 +05:30
Shreya
c0c470b56d fixed json affected by latest merge 2017-11-29 19:31:15 +05:30
Zarrar
95ee7654a1 Employee tree (#11667)
* nested set implemented

* treeview for employee

* patch added to assign lft rgt, update nsm_model on trash

* call on_trash method of super class
2017-11-29 18:44:02 +05:30
rohitwaghchaure
facf503f11 Merge pull request #11783 from rohitwaghchaure/minor_sales_invoice
[minor] Removed hidden for field pos profile
2017-11-29 17:43:59 +05:30
Rohit Waghchaure
17e03cf3fc [minor] Removed hidden for field pos profile 2017-11-29 17:40:42 +05:30
Rushabh Mehta
0154538c06 [fix] [minor] pos.js 2017-11-29 16:42:02 +05:30
Vishal Dhayagude
855e390265 [fix] Sales Invoice json conflict (#11779) 2017-11-29 16:25:24 +05:30
rohitwaghchaure
1b344ca81e [Fix] POS not loading if pos profile not defined (#11778) 2017-11-29 16:21:51 +05:30
Vishal Dhayagude
d42242df22 [Feature] Shipping Rule Calculation based on Net Weight (#11770)
* [new] Calculate shipping tax based on weight

* [fix] Change field name weight to weight_per_unit in SI Item

* [new] Shipping Rule based tax for selling module

* [new] Shipping rule based on weight added to Buying module

* [fix] Conflict in jsons

* [fix] Removed Redudant add_fetch

* [fix] Codacy fixed

* [fix] Print hide added
2017-11-29 16:09:59 +05:30
KanchanChauhan
2d1cbd0b2e Delete old asset doctypes from Accounts module and minor changes (#11766) 2017-11-29 16:03:00 +05:30
Nabin Hait
29390d3cb7 Merge branch 'creamdory-add_delivery' into develop 2017-11-29 15:53:29 +05:30
Nabin Hait
ad2a3e4f38 Cleanup and fixes on delivery trip 2017-11-29 15:53:01 +05:30
Nabin Hait
46e285efe9 Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery 2017-11-29 14:15:16 +05:30
rohitwaghchaure
f591a220c9 Fetch items of item groups defined in the pos profile (#11763) 2017-11-29 13:55:13 +05:30
Zarrar
c43c5cae5a Set query sales order (#11772)
* set_query for sales order based on production_item

* codacy fix

* check in packed item to fetch sales order

* Update production_order.py
2017-11-29 13:54:35 +05:30
rohitwaghchaure
2fb8cc5f2c [fix] Options must be a valid DocType for field Asset Category in row 18 (#11773)
* [fix] Options must be a valid DocType for field Asset Category in row 18

* test cases
2017-11-29 13:50:04 +05:30
rohitwaghchaure
4a15711b04 Merge pull request #11768 from tundebabzy/issue-11749
add missing field and value parameters
2017-11-29 11:22:20 +05:30
tundebabzy
2a4fefc6ff Auto fetch batches based on quantity on POS (#11004) (#11767)
* prevent premature escape when item has serial no and batch no

* fetch actual_batch_qty for item

* add available_qty to dialog

* remove expired batches from drop-down

* Update queries.py
2017-11-29 10:53:09 +05:30
Julian Robbins
d7216b559f Fix missing space and improve wording (#11764) 2017-11-29 10:49:35 +05:30
Julian Robbins
d785e22211 Fix spelling of accessibility (#11765) 2017-11-29 10:49:12 +05:30
pawan
54465f5df1 review comments changes 2017-11-29 10:18:38 +05:30
tunde
0d82b6979e add missing field and value parameters 2017-11-28 23:30:03 +01:00
tundebabzy
bc7c387a0d set read only property properly (#11761) 2017-11-28 22:40:05 +05:30
Prateeksha Singh
bf31d853e7 Merge pull request #11762 from manassolanki/fix
fix for module in the new report
2017-11-28 19:08:52 +05:30
Manas Solanki
34a8be83ea delete the old files 2017-11-28 18:47:56 +05:30
Manas Solanki
49ff065684 fix for the new report module 2017-11-28 18:44:06 +05:30
Manas Solanki
84e9d45055 Minor fixes for the Education domain (#11758)
* add the new role Education Manager for education settings

* minor changes in the hooks for bootinfo

* Fix for amending the assessment plan
2017-11-28 18:04:08 +05:30
Nabin Hait
7e07c150ed Merge branch 'KanchanChauhan-asset-maintenance' into develop 2017-11-28 16:57:56 +05:30
Nabin Hait
cf9573ab2f Removed asset doctypes files from accounts module and patches 2017-11-28 16:56:53 +05:30
rohitwaghchaure
c037dc775e Refactor multi pos profile selection in the pos invoice (#11721) 2017-11-28 16:11:15 +05:30
Shreya Shah
8d9edbf133 Letterhead in user progress (#11679)
* added letter-head to user progress slides

* added letterhead action to patch

* improvised

* added date in patches.txt
2017-11-28 16:09:58 +05:30
Kanchan Chauhan
e58a41a8a2 Added maintenance to Asset and enhanced maintenance for Asset Maintenance 2017-11-28 15:14:56 +05:30
Nabin Hait
35cd1d325f [fix] Set GST State code based on state, even if GSTIN not mentioned (#11755) 2017-11-28 13:01:01 +05:30
Doridel Cahanap
de82fe9e8f [minor] Set Rename for Training Program (#11740) 2017-11-28 11:26:23 +05:30
Saurabh
b750b304dd fixed merge-conflicts 2017-11-28 11:02:28 +05:30
Saurabh
7b833802a9 Merge branch 'hotfix' 2017-11-28 11:00:17 +05:30
Saurabh
d86ace41a1 bumped to version 9.2.17 2017-11-28 11:30:17 +06:00
Jamsheer
b488475d92 Remove Company from Patient - Patches Added (#11716)
* Remove Company from Patient - Patches Added

* Update patient DOB field label to Date of birth

* Patient marital status default null

* Update patient.py
2017-11-28 10:47:06 +05:30
Saurabh
8eda0cc8ba [fix] validate bom if order type is subcontracting (#11705)
* [fix] validate bom if order type is subcontracting

* [fix] moved validation to server side
2017-11-28 10:41:35 +05:30
rohitwaghchaure
a14baf4188 Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case
[fix] payment terms test case
2017-11-27 12:05:57 +05:30
Saurabh
9d0092f89a [fix] pull source warehouse from production order child table (#11718) 2017-11-27 12:04:41 +05:30
Shreya Shah
e3d6d21ec5 [Fix] Item name and description in production order (#11723)
* fetch item name and description from bom

* Update production_order.py

* patch added

* Update set_item_name_in_production_order.py
2017-11-27 12:02:13 +05:30
Charles-Henri Decultot
22641e44ad Allowing the creation of an Oganization as Lead (#11724)
* Allow the creation of an organization lead

* Changes following test fails

* Test case correction
2017-11-27 11:58:22 +05:30
Shreya Shah
dcbc4284d3 expenses included in valuation account type in purchase taxes and charges (#11725) 2017-11-27 11:48:09 +05:30
Rohit Waghchaure
52bf56d415 [fix] payment terms test case 2017-11-27 11:43:52 +05:30
rohitwaghchaure
373b5702a9 [fix] Server test cases (#11727) 2017-11-27 11:27:28 +05:30
Saurabh
ab5e77ecf1 [fix] do not pull disabled pos profiles (#11733) 2017-11-27 11:26:13 +05:30
pawan
f5279a0d67 [fix] #8427 2017-11-24 11:21:47 +05:30
rohitwaghchaure
15f8fe0179 [fix] Batch selected in the sales transaction for non batch item (#11713) 2017-11-24 10:46:27 +05:30
Saurabh
41f60546a1 [fix] do not allow user to create party type (#11706) 2017-11-23 18:02:51 +05:30
Nabin Hait
82ef26b327 Minor fix in patch 2017-11-23 17:57:33 +05:30
Nabin Hait
aa5b566ea9 Merge branch 'ashish-greycube-feature_10861-1' into develop 2017-11-23 17:49:25 +05:30
Nabin Hait
68768252ce Cleanup and fixes on bypass credit limit check on sales order 2017-11-23 17:48:59 +05:30
rohitwaghchaure
1e381584de Merge pull request #11703 from rohitwaghchaure/pos_bind_event_issue
Code cleanup
2017-11-23 16:31:54 +05:30
Rohit Waghchaure
09b39f06ea Code cleanup 2017-11-23 16:30:10 +05:30
Nabin Hait
57952f6946 Merge branch 'develop' into feature_10861 2017-11-23 16:12:55 +05:30
Manas Solanki
966f141f62 Rename schools to Education (#11524)
* renaming for the docs, demo data and patch

* changes in the doctypes and reports

* rename the config file

* Few name changes in messages and license

* rename the school settings to education settings

* changes in the documentation

* added the setup file for the fixtures

* corrected the ui tests file path

* fix the codacy

* add the patch for renaming few doctypes and fields

* changes in the patch
2017-11-23 15:22:10 +05:30
Nabin Hait
cda4d50063 Fixed reserved qty for production logic and patch for reposting (#11691) 2017-11-23 13:05:43 +05:30
tundebabzy
acccdb3890 Default batch number selection (#11454)
* fetch batch_no in `get_basic_details`

* PEP8 changes and docstring

* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch

* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out

* fetch batch number in `get_basic_details` using FEFO

* add new function - `set_batch_number`

* `set_batch_number` when `qty` is triggered

* `set_batch_number` when `uom` is triggered

* whitelist `get_batch_no_fefo`

* code clean up

* move `set_batch_number` to conversion_factor instead of uom

* rename `get_batch_no_fefo` to `get_batch_no`

* fix test case

* final cleanup

* Revert "fetch batch_no in `get_basic_details`"

This reverts commit dd024b1eb3.

* fix test case

* update Sales Invoice manual

* move changes away from `transaction.js`

* query should not fetch expired batches

* refactor `get_batch_no`:
add new function `get_batches`

* Update batch.py
2017-11-23 13:05:15 +05:30
Nabin Hait
82027ea3bf Set print hide property for payment terms 2017-11-23 12:49:42 +05:30
Manas Solanki
30babee2ef add courses in the program enrollment (#11694) 2017-11-23 12:19:57 +05:30
Zarrar
a90274fed9 linking issue in dashboard (#11701) 2017-11-23 12:19:40 +05:30
Jamsheer
1ce56316ea Populate patient_name in Healthcare Doctypes (#11690)
* On Cancel Consultation - Open Appointment - Delete Medical Record

* Add Filter on Account Selection - is_group: 0

* Patient Medical Record - List view Fixes

* Update consultation.py

* Set Appointment Refrence in Vital Signs

* Add Other in Gender Selection

* Populate patient_name in Healthcare Doctypes
2017-11-23 12:18:43 +05:30
Helkyd
6e3f789f82 code fixe
fixed })
2017-11-22 16:12:27 +01:00
Helkyd
3264c13545 No ZERO payment
If no payment mode selected does not process ... to avoid having SI with payment pending as POS for sure was paid..
2017-11-22 16:06:22 +01:00
Helkyd
0195528798 Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into develop 2017-11-22 14:51:18 +01:00
Helkyd
2b6bf82d61 Default Payment Mode
POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done.
2017-11-22 14:49:51 +01:00
Saurabh
ed4191ec5b [fix] merge-conflicts 2017-11-22 18:01:56 +05:30
Saurabh
7cf945c975 Merge branch 'hotfix' 2017-11-22 17:54:18 +05:30
Saurabh
4bc12b68e4 bumped to version 9.2.16 2017-11-22 18:24:18 +06:00
Nabin Hait
02ac901345 [fix] Rounding adjustment in company currency 2017-11-22 16:12:20 +05:30
rohitwaghchaure
4dc5f0efaf [Fix] Item details not fetching if item has no default bom (#11688) 2017-11-22 15:21:47 +05:30
Nabin Hait
96abfd2ab9 [fix] In payment entry, run some events serially to avoid async issue 2017-11-22 15:13:16 +05:30
Nabin Hait
036bf6de6e Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2017-11-21 20:19:13 +05:30
Nabin Hait
32a62a02df Fixed merge conflict 2017-11-21 20:18:03 +05:30
Nabin Hait
0551f7bb00 Cleanup and fixes of payment terms feature 2017-11-21 19:58:16 +05:30
Zarrar
657ceef105 skipped tax_account (#11678) 2017-11-21 17:40:22 +05:30
Faris Ansari
6ca6a69070 Course Scheduling Tool (#11676)
* [education] Fix Course Scheduling Tool

* minor
2017-11-21 17:28:51 +05:30
Rushabh Mehta
476c66d699 [fix] tests.txt 2017-11-21 17:02:39 +05:30
Rushabh Mehta
26ca6afd11 [fix] test.txt for accounts 2017-11-21 16:17:58 +05:30
rohitwaghchaure
e8ccc0e942 [enhance] Added multi UOM feature in Material Request (#11352)
* [enhance] Added multi UOM in Material Request

* test cases

* patch to update multi uom fields in material request item
2017-11-21 16:17:22 +05:30
Makarand Bauskar
75443a94ee [minor] set the pos profile name while creating demo (#11664) 2017-11-21 16:12:40 +05:30
Zarrar
f71f3af938 adding task to root node (#11666) 2017-11-21 16:12:01 +05:30
Saurabh
5add4897a5 Merge pull request #11506 from saurabh6790/test_patches
[travis] run patches by restoring v7 database
2017-11-21 15:56:54 +05:30
Saurabh
6edf12540a Merge pull request #11675 from saurabh6790/test-case-path-fixes
[fix] ui test-case path
2017-11-21 15:56:23 +05:30
Saurabh
d503f12713 [fix] ui test-case path 2017-11-21 15:22:41 +05:30
Rushabh Mehta
5171da81a1 [minor] fix-patch 2017-11-21 15:18:47 +05:30
Nabin Hait
cc884578b5 Update sales_order.py 2017-11-21 12:24:03 +05:30
rohitwaghchaure
834541a7e8 [fix] Added primary action in the modal which will show on the submission in the pos (#11575) 2017-11-20 11:31:53 +05:30
Britlog
1484793055 Shopping cart addresses management (#11657) 2017-11-20 11:22:18 +05:30
rohitwaghchaure
179e0c1d8d Added party name in accounts receivable/payable report (#11656) 2017-11-20 11:18:55 +05:30
creamdory
fd1503c6a5 [New Feature] Delivery 2017-11-20 10:28:49 +08:00
rohitwaghchaure
34d6340be6 Merge pull request #11647 from rohitwaghchaure/pos_selling_price_issue
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 21:33:32 +05:30
Rohit Waghchaure
77940493a8 [fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment 2017-11-18 19:06:31 +05:30
Prateeksha Singh
e1b8629313 Fix setup wiz test (#11640)
* increase timeout in setup wiz test

* enable profile slide
2017-11-17 20:08:45 +05:30
KanchanChauhan
0fe455a991 [Minor][Bug] Fix syntax error (#11633) 2017-11-17 20:08:15 +05:30
Saurabh
00e82cdab3 [fix] patch fixes to setup patch tester on travis 2017-11-17 19:08:01 +05:30
Saurabh
a8823eadb6 [travis] run patches by restoring v7 database 2017-11-17 19:08:01 +05:30
Prateeksha Singh
241d64d8c1 Merge pull request #11634 from pratu16x7/variant-modal-fix
[minor] fix plurals spacing
2017-11-17 15:34:34 +05:30
pratu16x7
83587c72f6 [minor] fix plurals spacing 2017-11-17 15:33:12 +05:30
Saurabh
a4f78211ab Merge branch 'master' into develop 2017-11-17 14:55:24 +05:30
Saurabh
a5b53e9480 Merge branch 'hotfix' 2017-11-17 14:55:23 +05:30
Saurabh
f773af6053 bumped to version 9.2.15 2017-11-17 15:25:23 +06:00
Saurabh
119a50e228 Merge pull request #11630 from saurabh6790/domain_settings_fix
[fix] set default language in local
2017-11-17 14:54:38 +05:30
Saurabh
11ec2c50e0 [fix] set default language in local 2017-11-17 14:51:08 +05:30
Zarrar
1b4894c33a make root_type null if not root (#11626) 2017-11-17 14:32:12 +05:30
Rushabh Mehta
30dc9a14c6 [feature] [refactor] Shipping Rule for Buying + Refactor (#11628)
* Shipping rule for Buying

* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104 [fix] merge-conflicts 2017-11-17 14:03:13 +05:30
Saurabh
1e74519726 Merge branch 'hotfix' 2017-11-17 14:01:30 +05:30
Saurabh
05ed86a00e bumped to version 9.2.14 2017-11-17 14:31:29 +06:00
Saurabh
d40ae81fc9 Merge pull request #11627 from rohitwaghchaure/pos_redirect_issue
[fix] POS redirect issue
2017-11-17 13:55:10 +05:30
Rohit Waghchaure
44f7b157ff [fix] POS redirect issue 2017-11-17 13:52:11 +05:30
Nabin Hait
7fa111de45 Update sales_invoice.py 2017-11-17 12:55:08 +05:30
Nabin Hait
6b70906deb Update purchase_invoice.py 2017-11-17 12:54:32 +05:30
Nabin Hait
1c4653ed97 Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
Saurabh
3499ba08df [fix] do not translate domains while creating db record (#11616) 2017-11-17 12:29:26 +05:30
Nabin Hait
877e1bb377 Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542) 2017-11-17 12:27:43 +05:30
Nabin Hait
1783549e75 Minor fixes in patch 2017-11-17 12:20:07 +05:30
Rushabh Mehta
58dccf38c5 [fix] for tests 2017-11-17 12:12:53 +05:30
Prateeksha Singh
744ff0010b Variant report (#11618)
* Item Variant Details Report

* remove queries from inside for loop

* make attribute value map

* Update item_variant_details.py
2017-11-17 12:00:29 +05:30
hiousi
d81e9f30dd [fix] issue #11456 (#11612)
using bench export-fixtures create a erpnext/fixtures/web_form.json file 
see :
https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063
2017-11-17 11:42:24 +05:30
Britlog
b6096057c6 Hide cart icon and badge count after logging out (#11530) 2017-11-17 11:41:35 +05:30
Britlog
2a89a502f0 [Website] Items list and stock (#11480)
* Add stock availability in items list and a parameter to set the number of products per page

* Substract reserved_qty from actual_qty for website stock
2017-11-17 11:41:07 +05:30
Vishal Dhayagude
82b200e497 [fix] Patch fail (#11623) 2017-11-17 11:01:42 +05:30
Britlog
d9978d9c4f Check stock in shopping cart (#11529) 2017-11-16 18:38:13 +05:30
rohitwaghchaure
51a397c97f [fix] Valuation rate in stock entry and code cleanup (#11614) 2017-11-16 18:23:16 +05:30
Manas Solanki
bb34c57603 link the address and contact with the sales partner (#11592) 2017-11-16 18:10:04 +05:30
Prateeksha Singh
8f43d2514c Multiple variant creation dialog (#11608)
* Multiple variant creation dialog

* variant dialog codacy fixes

* [multiple variants] show_alert, and other minors
2017-11-16 18:06:26 +05:30
Nabin Hait
1749b7c16b Minor fixes related to account renaming and deletion 2017-11-16 17:49:54 +05:30
Rushabh Mehta
a5ebebd09c [enhance] Add Issue Type and Opportunity Type masters (#11598)
* [enhance] added & linked Issue Type & Opportunity Type with opportunity

* [patch] create issue and opportunity type from the custom field if available

* [minor] issue_type and opportunity type should be mandatory

* [patches] removed try catch from the patch

* [fix] patch

* [refactor] cleanup issue/opportunity type
2017-11-16 17:03:52 +05:30
Nabin Hait
46be9896a9 Account number in chart of accounts (#10551)
* Account number in chart of accounts

* Include account number while renaming account

* Test case fixed

* Standard coa with and without numbers

* Standard coa with and without numbers
2017-11-16 16:51:55 +05:30
augustinfotech
135a54ca93 Allow print before pay in POS (#11590) 2017-11-16 15:28:42 +05:30
tundebabzy
f7e6934d7c handle None case in update_reserved_qty_for_production (#11593) 2017-11-16 14:13:49 +05:30
Manas Solanki
eb3982044b convert html into text in the taxes description as it can break the reports (#11603) 2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4 Added Warehouse, Cost Center, Owner filters to Sales Register (#11600)
* [fix] #3668

* fix codacy space issue
2017-11-16 14:09:17 +05:30
Neil Trini Lasrado
0df93d61eb Update update_sales_cost_in_project.py (#11595)
Will break if select sum(base_grand_total) from `tabSales Order` where project=p.name and docstatus=1 returns Null. Gives - "OperationalError: (1048, "Column 'total_sales_cost' cannot be null")" Error
2017-11-16 14:07:55 +05:30
rohitwaghchaure
21cbbae88f [fix] Payment reconcillation showing linked journal entries (#11611) 2017-11-16 14:05:57 +05:30
ashish
f17ca7866a removed names from comments 2017-11-16 11:08:14 +05:30
ashish
604eb9d689 added flag to function get_customer_outstanding and removed names in comments 2017-11-16 11:05:59 +05:30
ashish
a20c8dbd5c instead of caller as 3rd arg added a flag 2017-11-16 11:03:39 +05:30
ashish
a1feb32891 added json for bypass credit limit checkbox 2017-11-16 11:01:43 +05:30
ashish
f67372cfb3 removed logic from delivery note for checking bypass credit limit flag 2017-11-16 10:58:25 +05:30
ashish
8146c7a3df not required as default is set by default 2017-11-16 10:54:22 +05:30
ashish
bccdf74344 set default value of bypass_credit_limit flag removed as it is not required 2017-11-16 10:53:22 +05:30
ashish
62155fa0e5 Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861 2017-11-16 10:47:44 +05:30
Rushabh Mehta
8e5dcd06fb [fix] item.py 2017-11-15 17:53:44 +05:30
Rushabh Mehta
083dabaaf8 [fix] item.py 2017-11-15 17:08:53 +05:30
Frappe PR Bot
978cfdec2c [Translation] Updated Translations (#11591) 2017-11-15 16:30:08 +05:30
Rushabh Mehta
d3f5d0961a [feature] Opening Invoice Creation Tool (#11589)
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices

* [minor] added progress bar while creating invoice

* [minor] allow bulk upload for the invoices

* [minor] calculate item rate from net total

* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0

* [minor] check mandatory values before making opening invoices

* [minor] enable primary button if there is any error while creating invoices

* [minor] minor fixes, set company currency as invoice currency added tests

* [dashboard] added Opening Invoice Summery section in Dashboard

* [minor] added total invoices count on dashboard

* [minor] don't show dashboard if there are no opening invoices available

* [minor] added Opening Invoice Tools to Account's Tools section

* [minor] codecy fixes

* [fix] refactored general ledger and buttons on charts

* [fix] tests
2017-11-15 16:29:53 +05:30
Nabin Hait
78ab8235f6 Minor code cleanups in stock balance report 2017-11-15 14:43:54 +05:30
Brown-Harry Boma
b9e44217a2 [Fix]Codacy Issues 2017-11-15 14:43:54 +05:30
Brown-Harry Boma
2da8f6e89d Add Items Variants Attributes columns to Stock Balance Report 2017-11-15 14:43:54 +05:30
Zarrar
24b8aa2e80 set field dependent on link field fix (#11580) 2017-11-15 14:27:00 +05:30
Nabin Hait
94704beba3 Merge branch 'hotfix' 2017-11-15 14:08:17 +05:30
Nabin Hait
6fd163bc55 Merge branch 'master' into develop 2017-11-15 14:08:17 +05:30
Nabin Hait
429e5d57d5 bumped to version 9.2.13 2017-11-15 14:38:17 +06:00
Jamsheer
0abec034df Healthcare hotfix (#11586)
* On Cancel Consultation - Open Appointment - Delete Medical Record

* Add Filter on Account Selection - is_group: 0

* Patient Medical Record - List view Fixes

* Update consultation.py
2017-11-15 13:53:50 +05:30
Umair Sayed
3a9ca883b9 Update party.py (#11584) 2017-11-15 13:44:04 +05:30
Manas Solanki
bf59b5927f make route from item code if item name is None (#11579) 2017-11-15 10:55:22 +05:30
ppd1990
9bd84277db Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies (#10842) 2017-11-15 10:13:09 +05:30
schilgod
e418a5bdc1 Option to disable fetching last purchase details in Purchase Order (#11573)
* add check for enable/disable last purchase details in Purchase Order

* fix tabs
2017-11-15 09:49:49 +05:30
Jamsheer
bab226698f Healthcare hotfix (#11574)
* Patient dashboard - Vital Signs

* Remove submit validation in Consultation

* Physician Schedule - Add Time Slots - Fix

* Patient Appointment - Client side - fixes
2017-11-15 09:47:00 +05:30
rohitwaghchaure
43edd5d03c Employee loan fixes (#11495)
* Employee loan fixes

* Update update_employee_loan_details.py
2017-11-14 17:59:20 +05:30
Nabin Hait
50616da905 Merge branch 'master' into develop 2017-11-14 17:48:43 +05:30
Nabin Hait
3f83afe4e1 Merge branch 'hotfix' 2017-11-14 17:48:42 +05:30
Nabin Hait
ea3e6b93a7 bumped to version 9.2.12 2017-11-14 18:18:42 +06:00
Nabin Hait
10823e5a25 Merge branch 'neilLasrado-develop1' into develop 2017-11-14 17:40:45 +05:30
Nabin Hait
b55e98570f Minor fixes 2017-11-14 17:40:30 +05:30
Shreya Shah
be690ef817 Rate with margin in customer and company currency (#11437)
* field for company margin

* added base_rate_with_margin

* calculate company margin

* test for item price

* test for delivery note

* test for sales order

* test for quotation

* test for sales invoice
2017-11-14 17:22:41 +05:30
Nabin Hait
42274a4591 Delete healthcare domain items (#11567) 2017-11-14 17:15:11 +05:30
Nabin Hait
cd13a28417 Get items from quotation in sales invoice 2017-11-14 17:13:53 +05:30
AravindPranera
04e3518fad Update request_for_quotation.py 2017-11-14 17:13:53 +05:30
AravindPranera
5bae488f25 Update request_for_quotation.py 2017-11-14 17:13:53 +05:30
AravindPranera
86e726158b Getting Quotation Document in Sales Invoice 2017-11-14 17:13:53 +05:30
AravindPranera
0ebd3c373c Getting Quotation Document in Sales Invoice 2017-11-14 17:13:53 +05:30
Rushabh Mehta
b8b8dc119f [fix] item.py fix for _doc_before_save 2017-11-14 16:52:05 +05:30
Rushabh Mehta
cc1262c36d Add option to clean description html in item description. (#11565)
* [fix] add item settings

* [docs] Item Settings

* [fix] enqueue in item_settings.py

* [refactor] move to stock settings

* [refactor] move to stock settings
2017-11-14 16:36:25 +05:30
Rushabh Mehta
d5c6416d91 [new feature] Product Configurator (via Item Quick Entry) (#11535)
* [Feature] Item Variant Creation from Quick Entry

* [minor] formatted js

* [minor] set 3 attribute per page instead of 5 in template

* [fix] fixed codecy issue

* [fix] label translation

* [minor] changed trigger event of item template

* [fix] moved item ui tests under stock

* [UI test] added test for item attribute

* [UI test] added test for creation of item variant from quick entry

* [fix] item variant ui test fixes

* [wip]

* [cleanup] item quick entry

* [remove] tests, fixtures were missing

* [refactor] use set_only_once in item
2017-11-14 15:27:28 +05:30
tunde
ffa659fd2c Merge branch 'develop' into payment-terms 2017-11-14 09:59:45 +01:00
Nabin Hait
66f460ffbc Merge branch 'hotfix' 2017-11-14 13:58:37 +05:30
Nabin Hait
4d99ebaeb5 Merge branch 'master' into develop 2017-11-14 13:58:37 +05:30
Nabin Hait
0590d1da05 bumped to version 9.2.11 2017-11-14 14:28:37 +06:00
Saurabh
7d05a3470c [fix] added pygithub dependancy (#11559) 2017-11-14 13:41:01 +05:30
Rushabh Mehta
d8bc8de6ca [minor] remove unnecessary description in upload attendance, fixes #10603 2017-11-14 12:52:53 +05:30
Rushabh Mehta
98aa581864 [fix] default tax only on insert (#11544)
* [fix] default tax only on insert

* [fix] default tax only on insert

* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
Faris Ansari
3a5dceae18 Add Github Connector (#11259)
- Add new module ERPNext Integrations
2017-11-13 19:19:13 +05:30
Manas Solanki
e5aa9c5f2f new report - assessment plan status (#11504)
* new report - assessment plan status

* add the report in the school dashboard

* fix for the print format
2017-11-13 18:56:53 +05:30
Manas Solanki
69be5362a5 minor fixes in the assessment result (#11543) 2017-11-13 18:32:06 +05:30
Nabin Hait
ec8a0a22d7 Merge branch 'master' into develop 2017-11-13 15:10:17 +05:30
Nabin Hait
758c389ef3 Merge branch 'hotfix' 2017-11-13 15:10:16 +05:30
Nabin Hait
58ab203fc0 bumped to version 9.2.10 2017-11-13 15:40:16 +06:00
Nabin Hait
6605919ecd GL Entries on sale of an asset (#11538) 2017-11-13 15:06:35 +05:30
Saurabh
feeb47dbbe [fix] if not students in student groups then raise exception (#11537) 2017-11-13 13:52:58 +05:30
Nabin Hait
deeb1380b1 Ignore paid credit note in outstanding invoices in Payment Entry (#11534) 2017-11-13 13:52:05 +05:30
Saurabh
0f86d86e27 [fix] validate party account (#11517) 2017-11-10 19:21:09 +05:30
Faris Ansari
4ec4e3fb29 [patch] Revert Manufacturing User role (#11514) 2017-11-10 19:15:17 +05:30
Prateeksha Singh
17b7209032 remove erroneous column breaks (#11522) 2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788 remove erroneous column breaks (#11523) 2017-11-10 18:53:52 +05:30
Rushabh Mehta
4313326ba0 [fix] treeview for tasks (#11515)
[fix] treeview for tasks
2017-11-10 18:52:21 +05:30
Saurabh
a5275a1ba9 Merge branch 'master' into develop 2017-11-10 15:53:44 +05:30
Saurabh
241139001e Merge branch 'hotfix' 2017-11-10 15:53:43 +05:30
Saurabh
a10cd10640 bumped to version 9.2.9 2017-11-10 16:23:43 +06:00
Saurabh
44ef8654f9 Merge pull request #11510 from rohitwaghchaure/issue_11502
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:51:14 +05:30
Saurabh
71862f9024 Merge pull request #11509 from saurabh6790/bom_search_query_fix
[fix] query param fixes
2017-11-10 15:50:55 +05:30
Rohit Waghchaure
a5e3c3a79f Add item directly in the cart only if serial no, batch, barcode has enter in the search field 2017-11-10 15:29:26 +05:30
rohitwaghchaure
cc97ec9202 [hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip (#11507) 2017-11-10 15:06:58 +05:30
Saurabh
022ab63a0f [fix] query param fixes 2017-11-10 15:06:02 +05:30
Pawan Mehta
1368ba00bc [fix] #11337 (#11339) 2017-11-10 14:59:26 +05:30
Saurabh
cdf8016bcd Merge branch 'hotfix' 2017-11-10 13:15:04 +05:30
Saurabh
7b78a83592 Merge branch 'master' into develop 2017-11-10 13:15:04 +05:30
Saurabh
18c8cf965f bumped to version 9.2.8 2017-11-10 13:45:04 +06:00
Nabin Hait
29741fee08 Merge branch 'develop' into staging 2017-11-10 11:46:50 +05:30
Saurabh
7ab28ec562 [fix] give preference to gateway selected on shopping cart settings (#11393) 2017-11-10 11:17:01 +05:30
KanchanChauhan
e59c9ce9f4 Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch (#11413) 2017-11-10 11:16:29 +05:30
Alchez
1077c782a3 [Fix] Packing Slip creation if custom field does not have a value (#11423)
* [Fix] Packing Slip creation if custom field is Column/Section Break

* Used no_value_fields and sorted imports

* Update packing_slip.py
2017-11-10 11:14:57 +05:30
Nabin Hait
15753074bf Nestedset model fixes for changing parent and renaming (#11467) 2017-11-10 11:12:43 +05:30
Nabin Hait
8e3da7f70e Update test_assessment_plan.js 2017-11-10 10:59:17 +05:30
Nabin Hait
887285ed1a Update test_assessment_plan.js 2017-11-10 10:59:07 +05:30
Manas Solanki
aeb0026354 commits from develop merged PR's (#11491)
* better student search queries and minor fixes in the student group

* remove the print option for the tools

* fixes for the chart

* minor fixes in the fee module for print and permission, delete redundant doctype

* set the naming series and independent dob validation
2017-11-10 10:58:43 +05:30
rohitwaghchaure
1ce48e7032 [fix] POS profile patch (#11501) 2017-11-10 10:53:12 +05:30
Faris Ansari
99e31f97b8 set default params for paging (#11500) 2017-11-10 10:50:49 +05:30
Faris Ansari
4a864c1eea [fix] Update bom item description (#11498)
* [fix] Update bom item description

* Update item.py
2017-11-09 19:01:21 +05:30
Nabin Hait
c4de619eac Update assessment_plan.py 2017-11-09 14:36:11 +05:30
Nabin Hait
fe72ed003e Update test_assessment_plan.js 2017-11-09 11:47:13 +05:30
Prateeksha Singh
3e998bccba Merge pull request #11490 from pratu16x7/hotfix
[minor][hotfix] naming_series variable assignment
2017-11-08 17:22:49 +05:30
pratu16x7
40016372c6 [minor][hotfix] naming_series variable assignment 2017-11-08 16:30:15 +05:30
Saurabh
b97f08e0ac [fixed] merge-conflicts 2017-11-08 15:08:38 +05:30
Saurabh
af22f84809 Merge branch 'hotfix' 2017-11-08 15:07:33 +05:30
Saurabh
3894a5ed94 bumped to version 9.2.7 2017-11-08 15:37:33 +06:00
Saurabh
045b2877b7 [fix] remove warehouse from Stock Settings if warehouse wont exists (#11487) 2017-11-08 14:57:03 +05:30
Manas Solanki
a658630751 remove the print option from the tools (#11484)
* remove the print option for the tools

* better student search queries and minor fixes in the student group
2017-11-08 14:55:54 +05:30
Saurabh
148b62a206 Merge pull request #11486 from saurabh6790/patch_fixes_
[fix] catch link validation exception in POS profile and reload fees …
2017-11-08 14:48:33 +05:30
Saurabh
d2cef208fe [fix] catch link validation exception in POS profile and reload fees doctype 2017-11-08 14:44:43 +05:30
Nabin Hait
ff73646212 Made POS Profile mandatory and changed test order 2017-11-08 14:34:38 +05:30
Saurabh
4c617d6496 Merge branch 'staging' 2017-11-08 12:20:46 +05:30
Saurabh
eb760d6d09 Merge branch 'master' into develop 2017-11-08 12:20:46 +05:30
Saurabh
f985ae1379 bumped to version 9.2.6 2017-11-08 12:50:46 +06:00
Saurabh
98aa544f25 Merge branch 'master' into staging 2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736 [fix] merge-conflicts 2017-11-08 12:18:41 +05:30
Saurabh
6ad1082433 Merge branch 'hotfix' 2017-11-08 12:12:37 +05:30
Saurabh
db781e607a bumped to version 9.2.5 2017-11-08 12:42:37 +06:00
rohitwaghchaure
521606e433 Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option
[enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template
2017-11-08 11:49:24 +05:30
Rohit Waghchaure
acc8995c48 [enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template 2017-11-08 11:39:08 +05:30
Sushant Nadkar
72c40f0383 Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440) 2017-11-08 11:35:46 +05:30
Shreya Shah
d9e2b24535 task name in gantt view - clickable (#11459) 2017-11-08 11:35:19 +05:30
rohitwaghchaure
f688af3809 [fix] Offline pos name is not defined issue in the POS (#11469) 2017-11-08 11:33:39 +05:30
Achilles Rasquinha
7fd20f303f moved from MySQLdb to pymysql (#11462) 2017-11-08 11:33:24 +05:30
rohitwaghchaure
9f2a27c99c Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases
[fix] POS Profile test cases
2017-11-07 16:35:52 +05:30
rohitwaghchaure
6058dcc2ce Merge pull request #11470 from rohitwaghchaure/pos_online_invalid_grand_total_issue
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-07 16:19:51 +05:30
Rohit Waghchaure
35fc45eff9 [fix] POS Profile test cases 2017-11-07 10:43:16 +05:30
Rohit Waghchaure
57cc924d29 [Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart 2017-11-06 18:42:37 +05:30
Manas Solanki
36e2fb8d58 minor fixes in the fee module for print and permission, delete redundant doctype (#11430) 2017-11-06 17:44:59 +05:30
Nabin Hait
e552a51266 Minor cleanups 2017-11-06 17:39:31 +05:30
pawan
436f7b980c codacy issues 2017-11-06 17:39:31 +05:30
pawan
438dfc081b fix codacy issues 2017-11-06 17:39:30 +05:30
pawan
d59225635d remove old report 2017-11-06 17:39:30 +05:30
pawan
b699b86b76 Add Total Row 2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29 [fix] #11449 2017-11-06 17:39:30 +05:30
pawan
e61a275651 [fix] #11427 2017-11-06 17:39:30 +05:30
Manas Solanki
6ba2eda04a fixes for the chart (#11460) 2017-11-06 17:22:14 +05:30
rohitwaghchaure
bcb7854340 Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
rohitwaghchaure
adbbb0b0f3 Merge pull request #11364 from manassolanki/set-pos-profile
set the pos profile in the sales invoice
2017-11-06 14:08:59 +05:30
Manas Solanki
40ef7e7039 patch for renaming the pos profile and setting the pos profile name 2017-11-06 13:53:52 +05:30
Manas Solanki
b1616a0cb3 changes in thepos profile 2017-11-06 13:53:52 +05:30
Manas Solanki
3f0dfd720f set the pos profile in the sales invoice 2017-11-06 13:53:52 +05:30
Nabin Hait
f15a8409eb [tests] Test case fixes for task and project (#11445)
* [tests] Test case fixes for task and project

* Removed hard-coded dates from test cases

* Codacy fix
2017-11-06 11:11:34 +05:30
Saurabh
e850655c1d Merge branch 'master' into staging 2017-11-03 16:56:24 +05:30
Saurabh
5647bf081a Merge branch 'hotfix' 2017-11-03 16:56:23 +05:30
Saurabh
0faa61009f Merge branch 'master' into develop 2017-11-03 16:56:23 +05:30
Saurabh
56cb0aa9c1 bumped to version 9.2.4 2017-11-03 17:26:23 +06:00
Faris Ansari
cbaa0e629c fix codacy 2017-11-03 11:35:49 +05:30
Manas Solanki
76ce074c63 return the account details if and only if there is single account of that type (#11407) 2017-11-02 18:12:47 +05:30
rohitwaghchaure
7677ff00a2 [hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409) 2017-11-02 18:12:14 +05:30
Saurabh
62fd4007b0 Merge branch 'master' into staging 2017-11-02 12:14:42 +05:30
Saurabh
75f3f81a9b Merge branch 'hotfix' 2017-11-02 12:14:41 +05:30
Saurabh
3be72ef187 Merge branch 'master' into develop 2017-11-02 12:14:41 +05:30
Saurabh
870ce3cfea bumped to version 9.2.3 2017-11-02 12:44:40 +06:00
rohitwaghchaure
1473a37d8c Merge pull request #11395 from jay-parikh/develop
POS - Add % to the Discount Field #9749
2017-11-02 12:11:12 +05:30
Saurabh
0ad2cc3def Merge pull request #11403 from tundebabzy/issue-11402
Error In Employee Loan Form (#11402)
2017-11-02 12:09:54 +05:30
Saurabh
00f6c2d61d Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-02 12:07:32 +05:30
Saurabh
38008f8daa Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-02 12:07:14 +05:30
Saurabh
afb63af3b6 Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-11-02 12:06:08 +05:30
Rohit Waghchaure
816ce33daf [Fix] Customer is manadatory even if customer has selected in the Issue 2017-11-01 19:02:09 +05:30
rohitwaghchaure
69c6501842 Merge pull request #11399 from manassolanki/student-applicant
set the naming series from student admission and independent dob validation
2017-11-01 13:39:32 +05:30
Rohit Waghchaure
99748dbacf [Fix] Wrong difference amount in the payment entry for the internal transfer type 2017-11-01 11:45:02 +05:30
tunde
31287b00a6 call get_employee_loan_application only when appropriate 2017-10-31 18:10:17 +01:00
Faris Ansari
3d59179205 Load default pos profile if not found 2017-10-31 21:56:16 +05:30
Manas Solanki
a941a394ba set the naming series and independent dob validation 2017-10-31 17:34:50 +05:30
Rohit Waghchaure
5ec9f6930b [Fix] Getting an error while making delivery note from sales order and sales order has no item code 2017-10-31 15:26:56 +05:30
Jay Parikh
96f167573b POS - Add % to the Discount Field #9749 2017-10-31 01:07:09 -07:00
Zarrar
6d41a9a647 Converting Task to a Tree structure (#11117)
* added support for tree view

* nestedset added to handle tree based structure

* treeview ui added

* removed is_group dependency

* added validation while editing a group-task

* codacy fix

* BOM like filter added

* Added ui-test for treeview-task
2017-10-31 13:10:55 +05:30
Manas Solanki
160e710ebf set bank account only if there is single bank type account (#11363)
* set bank account only if there is single bank type account

* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Faris Ansari
40611e4f69 [fix] hub get_item_details (#11383) 2017-10-31 13:00:09 +05:30
KanchanChauhan
21f946f365 [Minor] Source Warehouse should be filtered by Company in Production Order (#11376) 2017-10-31 12:59:45 +05:30
Prateeksha Singh
6b26e391b8 use the new frappe charts :D (#11391) 2017-10-31 12:58:48 +05:30
Saurabh
dd0bdc7fa6 Merge pull request #11356 from tundebabzy/issue-11355
fix object has not attribute 'is_item_from_hub'
2017-10-31 12:23:09 +05:30
Faris Ansari
895aa7b7ac fix codacy 2017-10-30 17:12:50 +05:30
Faris Ansari
2c8a309106 Merge branch 'develop' into multiple-users-pos-profile 2017-10-30 15:02:28 +05:30
Faris Ansari
7095de03ef Merge branch 'develop' into multiple-users-pos-profile 2017-10-30 15:00:55 +05:30
Faris Ansari
79be8f969f Add to patches.txt 2017-10-30 14:46:09 +05:30
ci2014
e741b91f1d Update issue.js (#11381)
Make the close / reopen button more flexible for customized user status.

For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example.

This will make it more flexible.
2017-10-30 10:13:05 +05:30
tunde
5ea10a77a3 Merge branch 'develop' into payment-terms 2017-10-27 17:37:15 +01:00
Faris Ansari
638e3f9fa6 Merge pull request #11154 from netchampfaris/hub-item-image
[hub] fix company page routing
2017-10-27 17:07:10 +05:30
Saurabh
1bc8e32f94 Merge pull request #11360 from manassolanki/fix-fee-patch
fix the fee patch
2017-10-27 17:00:11 +05:30
Faris Ansari
8c1099d236 Add POS Profile User DocType 2017-10-27 16:48:07 +05:30
Manas Solanki
8637e52d4c fix the fee patch 2017-10-27 11:55:15 +05:30
ashish
b883e4ee0d customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added. 2017-10-26 20:32:08 +05:30
ashish
ca2250c440 sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added. 2017-10-26 20:22:34 +05:30
ashish
751b05f1e8 sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added. 2017-10-26 20:15:24 +05:30
ashish
9dfc0f32ab customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate.
test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.
2017-10-26 20:07:32 +05:30
tunde
bbce7b7e5d get attribute with get method 2017-10-26 14:31:13 +01:00
tunde
6575a615b1 get attribute with get method 2017-10-26 14:30:18 +01:00
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
Faris Ansari
c83413134d Merge pull request #11294 from revant/map_field_docs
[Docs] added field for storing map
2017-10-26 17:19:46 +05:30
Nabin Hait
c799a22d55 Merge branch 'master' into staging 2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9 Merge branch 'master' into develop 2017-10-26 14:35:34 +05:30
Nabin Hait
92e09c0b7b Merge branch 'hotfix' 2017-10-26 14:35:33 +05:30
Nabin Hait
819c50c042 bumped to version 9.2.2 2017-10-26 15:05:33 +06:00
Faris Ansari
6887cedaea [fix] item qty trigger (#11349) 2017-10-26 14:34:15 +05:30
Nabin Hait
aa7896f1e1 [test] Fixed physician test cases (#11347) 2017-10-26 14:33:28 +05:30
Nabin Hait
52909b73bb [test] Fixed advance jv cancellation (#11333) 2017-10-26 11:06:07 +05:30
Saurabh
b445633e56 Merge branch 'master' into staging 2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d Merge branch 'master' into develop 2017-10-26 09:59:22 +05:30
Saurabh
5235aa833c Merge branch 'hotfix' 2017-10-26 09:59:22 +05:30
Saurabh
d0131762cc bumped to version 9.2.1 2017-10-26 10:29:22 +06:00
Saurabh
97b98b6c01 Merge pull request #11345 from saurabh6790/setup_wiz_fixes
[HOTFIX] translate domain
2017-10-26 09:52:45 +05:30
Saurabh
92a6155bb0 [fix] translate domain 2017-10-26 09:44:51 +05:30
Faris Ansari
33d74ce6e5 Merge branch 'develop' into hub-item-image 2017-10-25 18:06:42 +05:30
Saurabh
d6e67ce123 [fix] check for null date fields (#11334) 2017-10-25 17:44:22 +05:30
Nabin Hait
6a4e230cde [fix] Status of Item (#11326) 2017-10-25 17:06:30 +05:30
rohitwaghchaure
c65f1d7745 Search item using name instead of item code (#11327) 2017-10-25 17:04:56 +05:30
rohitwaghchaure
e02ee898e9 [Fix] Production order not displaying in the calendar view, if po has no operations (#11328) 2017-10-25 17:04:31 +05:30
rohitwaghchaure
2e6f6d6749 [minor] cleanup code (#11331) 2017-10-25 17:03:49 +05:30
ashish
8fbf10f5db New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level 2017-10-25 16:20:50 +05:30
ashish
fb364df091 customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set 2017-10-25 16:17:55 +05:30
ashish
ff20182d03 sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice 2017-10-25 16:11:58 +05:30
ashish
8ad4efee25 sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice 2017-10-25 16:07:21 +05:30
ashish
06e6a82d56 customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified 2017-10-25 15:56:39 +05:30
Nabin Hait
014b138074 Merge branch 'tundebabzy-issue-11080' into hotfix 2017-10-25 15:53:53 +05:30
Nabin Hait
fb734976eb Removed appintment field from Invoice, it should be a custom field and will be added from domain settings 2017-10-25 15:53:07 +05:30
Nabin Hait
6500af9aa2 Merge branch 'develop' into staging 2017-10-25 14:25:06 +05:30
Nabin Hait
8f2500083c Merge branch 'master' into develop 2017-10-25 14:10:39 +05:30
Nabin Hait
8e7ba95b78 Merge branch 'staging' 2017-10-25 14:10:38 +05:30
Nabin Hait
e146143bd1 bumped to version 9.2.0 2017-10-25 14:40:38 +06:00
Nabin Hait
4d22b6db30 Fixed Merge Conflict 2017-10-25 14:09:46 +05:30
Nabin Hait
cd3dbcb2ef Fixed Merge Conflict 2017-10-25 14:07:25 +05:30
Nabin Hait
bdfc074a7d Merge branch 'hotfix' 2017-10-25 14:02:33 +05:30
Nabin Hait
c7bd77111e bumped to version 9.1.8 2017-10-25 14:32:32 +06:00
rohitwaghchaure
4a60554b91 Green indicator in the cart for non stock item (#11325) 2017-10-25 13:59:29 +05:30
rohitwaghchaure
3dc21b099d [Fix] Translation issue (#11323) 2017-10-25 12:38:17 +05:30
tundebabzy
40a02769c5 Error in the Address fetched in Sales Order.(#11129) (#11145)
* add new function - `get_party_shipping_address`

* `swap `get_default_address` with `get_party_shipping_address`

* test cases

* properly sets order by direction

* move `get_party_shipping_address` to party.py

* fix test module import
2017-10-25 12:24:34 +05:30
tundebabzy
bafcd7418a Add Bundle Description Field To Product Bundle (#11122)
* add description field that shows in list view

* description field should be simply `description`
2017-10-25 12:22:08 +05:30
Makarand Bauskar
085b4842a1 [minor] minor fixes in get_company_details for Hub page (#11168) 2017-10-25 12:19:10 +05:30
Makarand Bauskar
e6712c129c [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182)
* [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings

* [minor] renamed the allow_stale_rate method to stale_rate_allowed
2017-10-25 12:17:40 +05:30
Doridel Cahanap
49a7bde6e2 [minor] Label for Training Event in Training Program Dashboard (#11280) 2017-10-25 12:15:17 +05:30
Manas Solanki
464289b726 copy the older total amount field and corrsp. changes in report (#11322) 2017-10-25 12:13:42 +05:30
Nabin Hait
1c1237537b Subscription fixes (#11292)
* Subscription fixes

* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
Nabin Hait
b7483f6dfd Update item.json 2017-10-25 11:58:02 +05:30
tundebabzy
cba7a11d75 Make Variant does not copy UOM properties (#10887) (#11261)
* add `uoms` to Item Variant Settings if not already added

* add new patch to patch list

* change uoms field to no_copy:0
2017-10-25 11:57:10 +05:30
Pawan Mehta
07ab4622e8 [fix] #9824 - Calculate costing amount even if billable is unchecked (#11310)
* [fix] #9824

* fix code
2017-10-25 11:55:49 +05:30
Narciso E. Núñez Arias
47caf51efe [docs] Translate the Projects section of the Manual to Spanish (#11319)
* [docs] Translate projects module. Add index page

* [docs] Translate activity cost page from projects module.

* [docs] Translate activity type page from projects module.

* [docs] Translate the Project Costing article in project module

* [docs] Translate the Project page in projects module

* [docs] Translate the Task page in projects module

* [docs] Translate the Time Log Batch page in projects module
2017-10-25 11:53:10 +05:30
rohitwaghchaure
2672c331af Validation for duplicate offline pos (#11281) 2017-10-25 11:47:18 +05:30
Nabin Hait
f4283a3ebf Moved company field to the top in BOM (#11283) 2017-10-25 11:46:47 +05:30
Nabin Hait
8a0943ead7 Unlink reference doc on Journal Cancellation only if advance (#11285) 2017-10-25 11:46:35 +05:30
Nabin Hait
82c9352d53 Update variant description based on attribute if not already there (#11302) 2017-10-25 11:46:20 +05:30
rohitwaghchaure
311823aca1 Validate stock exists against template item (#11305) 2017-10-25 11:45:51 +05:30
Charles-Henri Decultot
7862eb444f [Hotfix] Addition of an empty tax group in the french CoA (#11306) 2017-10-25 11:44:46 +05:30
Neil Trini Lasrado
1f99bea6ce Pass sender as contact email in Opportunity (#11308)
Always pass sender as the contact email while creating an opportunity for a website enquiry.
2017-10-25 11:44:12 +05:30
Manas Solanki
a5eee4629f Fix UI tests (#11309)
* decrease the timeout

* delete the duplicate test
2017-10-25 11:42:22 +05:30
Nabin Hait
6c06e700d6 [Fix] Unallocated amount considering deductions (#11314) 2017-10-25 11:42:05 +05:30
Revant Nandgaonkar
f8006b140f [Docs] Map field renamed to Geolocation 2017-10-25 11:18:29 +05:30
tunde
c8d2361b81 Merge branch 'develop' into payment-terms 2017-10-24 12:25:29 +01:00
Revant Nandgaonkar
010f619ed3 [Docs] added field for storing map
related PR https://github.com/frappe/frappe/pull/4327
2017-10-23 17:25:52 +05:30
vishalseshagiri
5c5a853894 Update customer_group.py (#11270)
Minor syntactical error !
2017-10-23 11:35:49 +05:30
Doridel Cahanap
b06f155ceb [minor] Set Quick Entry to False in Training Event (#11279) 2017-10-23 11:35:12 +05:30
Nabin Hait
f76bc27db5 Merge branch 'develop' into staging 2017-10-21 11:34:44 +05:30
Nabin Hait
b88b7eaf5b Merge branch 'hotfix' 2017-10-21 11:29:40 +05:30
Nabin Hait
7533101d4b Merge branch 'master' into develop 2017-10-21 11:29:40 +05:30
Nabin Hait
e7eda65968 bumped to version 9.1.7 2017-10-21 11:59:39 +06:00
rohitwaghchaure
5fdd26f1e7 [fix] Discount amount not reset for new order in offline pos (#11258) 2017-10-21 11:23:45 +05:30
Nabin Hait
c44290955e Minor fix in patches (#11268) 2017-10-21 11:20:18 +05:30
Nabin Hait
4825eccad5 UI test fixed for supplier quotation (#11260)
* UI test fixed for supplier quotation

* ui test fixes for purchase order

* Fixed number of assertion in student admission test

* Fixed multiple ui tests

* ui tests
2017-10-21 10:44:30 +05:30
Doridel Cahanap
5a4d5bfaf2 Add Training Program DocType, Script, Path and Doc (#11181)
* Add Training Program Doctype, Script, Config and documentation

* Add Training Program to Training Event

* [Test Case] Training Event in a Training Program
2017-10-20 11:31:15 +05:30
Nabin Hait
b4f5f14438 Timeout increased for setting __newname (#11252)
* Timeout increased for setting __newname

* UI test fixes

* fixed ui test for PO

* ui tests

* ui tests

* ui tests

* ui tests

* ui tests
2017-10-20 11:26:17 +05:30
tunde
09ce68ec19 Merge branch 'develop' into payment-terms 2017-10-19 17:47:31 +01:00
Nabin Hait
bb60a59b96 Fixed asset test cases due to tax rule (#11247)
* Fixed asset testcases due to tax rule

* Delete tax rule record after running test cases

* Fixed test cases

* Fixed test cases

* Fixed subscription tests due to tax rule
2017-10-19 12:14:37 +05:30
Neil Trini Lasrado
eb662b5a9a Added Test Cases 2017-10-18 18:16:47 +05:30
Neil Lasrado
7935d186f9 Auto set warehouses in Production Order if default warehouses are set in Manufacturing Settings and not mentioned in Production Order 2017-10-18 18:16:47 +05:30
Neil Lasrado
af091ac5dd [BUG] Map Production Order with the exact Sales Order line item 2017-10-18 18:16:46 +05:30
Neil Lasrado
5afc194742 [BUG] Fixes make Production Order from Sales Order 2017-10-18 18:16:46 +05:30
Saurabh
5fa2adcca9 Merge branch 'master' into develop 2017-10-18 16:23:44 +05:30
Saurabh
12e817bad6 Merge branch 'hotfix' 2017-10-18 16:23:43 +05:30
Saurabh
47e405516b bumped to version 9.1.6 2017-10-18 16:53:43 +06:00
Saurabh
4272483f2d Merge pull request #11246 from saurabh6790/item_variant_description_fix
[minor-fix] patch fix
2017-10-18 16:15:43 +05:30
Saurabh
3173be9b17 [minor-fix] patch fix 2017-10-18 16:14:20 +05:30
Saurabh
9cb817874d Merge pull request #11245 from saurabh6790/item_variant_description_fix
[fix] remove explicit variant save
2017-10-18 16:08:23 +05:30
Saurabh
8227422124 [fix] remove explicit variant save 2017-10-18 16:03:40 +05:30
Saurabh
a7d5f94d4a [fix] Do not append description to variant if description already exists (#11204) 2017-10-18 16:02:08 +05:30
Ranjith Kurungadam
7624e7bf85 [hot-fix] sql getting translated (#11243)
* fix remove _ in frappe.sql

* use %s replacement for sql
2017-10-18 15:48:12 +05:30
Jamsheer
dd7c1b87c5 Healthcare Doctypes - Docfield Clean up (#11065)
* Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect.

* Healthcare Doctype - remove frappe import
2017-10-18 12:13:15 +05:30
Makarand Bauskar
3e4ca4219f [hotfix] fixed 'ValueError: Unknown string format' error if the from_time value is null (#11162) 2017-10-18 11:16:47 +05:30
Helkyd
7ec7a45f05 Salary Detail Abbr (#11165)
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-18 11:16:24 +05:30
Nabin Hait
cfb68dee34 Merge branch 'develop' into develop 2017-10-18 11:16:17 +05:30
Vishal Dhayagude
3e02d80636 [fix] Travis Client Side Failure (#11198) 2017-10-18 11:10:45 +05:30
Nabin Hait
5ab6ff2470 [fix] Fetch raw material rate based on last purchase rate (#11205)
* [fix] Fetch raw material rate based on last purchase rate

* Don't fetch sub-assembly item rate from BOM if not mentioned by the user
2017-10-18 11:09:11 +05:30
Brown-Harry Boma
11e964d442 Set transaction type in pricing rule only if unavailable (#11229)
* Set transaction type in pricing rule only if unavailable

* Update pricing_rule.py
2017-10-18 11:07:09 +05:30
rohitwaghchaure
a516856c32 [Fix] Getting an error duplicate name while making an invoice in draft mode (#11230) 2017-10-18 11:05:10 +05:30
Javier Wong
84f7ba8699 [hotfix] Allow Sales User and Purchase User to Read Account Settings (#11233)
* [hotfix] Allow Sales User and Purchase User to Read Account Settings

This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4.

* Added back Accounts Manager Permissions
2017-10-18 11:04:15 +05:30
rohitwaghchaure
a3fe5b8528 [Fix] Disable desk access view to supplier (#11234) 2017-10-18 10:53:34 +05:30
jigneshpshah
bad5e90e46 Priority of credit limit check functionality (#11232)
CREDIT LIMIT field is at customer, customer group and company level .
Explanation given on priority of the three levels.
2017-10-18 10:53:11 +05:30
Nabin Hait
a9feddbb79 Testcase fixes (#11238)
* Restaurant test records fixed

* Fixes for test cases
2017-10-18 10:52:48 +05:30
KanchanChauhan
44734049f5 [Minor] Populate Expense Claim Description from Expense Claim Type (#11156) 2017-10-17 17:23:26 +05:30
Rushabh Mehta
bc4e2cd9c1 [added] hospitality domain (#11020)
* [added] hospitality domain

* [tests] wip

* [tests] for restaurant

* [fix] tests for new naming

* [docs] added restaurant docs

* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
Prateeksha Singh
bfb108d722 Replace c3 (#11112)
* [charts] replace in asset.js

* replace in reports
2017-10-17 12:03:02 +05:30
Nabin Hait
45a640df08 Update payment_entry_reference.json 2017-10-16 12:58:32 +05:30
Nabin Hait
53659cf0bd Update payment_entry_reference.json 2017-10-16 12:57:51 +05:30
Makarand Bauskar
80f333950b [minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195) 2017-10-16 11:27:22 +05:30
mbauskar
cd4202c2f7 Merge branch 'master' into develop 2017-10-15 19:10:56 +05:30
mbauskar
d3214fed57 Merge branch 'hotfix' 2017-10-15 19:10:55 +05:30
mbauskar
bbbce58884 bumped to version 9.1.5 2017-10-15 19:40:55 +06:00
rohitwaghchaure
8bf7230fcc [Fix] New invoice showing old paid amount if POS Profile is not created (#11160) 2017-10-15 19:09:14 +05:30
rohitwaghchaure
496174bbdf [Fix] Naming series not copy from referebce document to new document in subscription (#11196) 2017-10-15 19:08:42 +05:30
Nabin Hait
4072d71769 Delete api.py 2017-10-11 23:53:57 +05:30
Helkyd
e9f2b176bc Salary Detail Abbr
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-11 15:02:27 +01:00
Faris Ansari
7997271368 [hub] fix company page routing 2017-10-11 15:46:21 +05:30
Saurabh
5ffed60916 Merge branch 'master' into develop 2017-10-11 14:39:11 +05:30
Saurabh
8854438830 Merge branch 'hotfix' 2017-10-11 14:39:10 +05:30
Saurabh
15411fcf70 bumped to version 9.1.4 2017-10-11 15:09:10 +06:00
rohitwaghchaure
76a9cefc9c Merge pull request #11151 from rohitwaghchaure/minor_fix_title
[minor] Title not showing in payment modal
2017-10-11 12:05:29 +05:30
Rohit Waghchaure
4f7873b9df [minor] Title not showing in payment modal 2017-10-11 12:03:49 +05:30
Saurabh
ad9afe68f3 Merge pull request #11119 from rohitwaghchaure/default_company_pos
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-11 12:00:56 +05:30
Saurabh
41e2b98b63 Merge pull request #11137 from mbauskar/healthcare
[hotfix] passed localise item_group value for create_lab_test_itemsfield
2017-10-11 12:00:12 +05:30
rohitwaghchaure
4eb5286c4b Merge pull request #11147 from rohitwaghchaure/total_amount_and_barcode_issue_pos
[Fix] Barcode and total amount issue in online POS
2017-10-11 11:13:30 +05:30
Rohit Waghchaure
3f309e1c20 Multiple items showing for single barcode 2017-10-11 02:14:56 +05:30
Rohit Waghchaure
9bb81ee1cb [fix] Total amount showing wrong in the payment modal if user has changed the qty after payment 2017-10-11 01:54:36 +05:30
Makarand Bauskar
4cdb9dee09 [minor] changed the modified date for the subscription doctype (#11142) 2017-10-10 18:41:00 +05:30
mbauskar
ee9da67173 [hotfix] passed localize item_group value for create_lab_test_itemsfield 2017-10-10 12:20:45 +05:30
Saurabh
9893a2d608 Merge branch 'master' into develop 2017-10-10 11:22:39 +05:30
Saurabh
e78601b040 Merge branch 'hotfix' 2017-10-10 11:22:38 +05:30
Saurabh
47b2a5f7d1 bumped to version 9.1.3 2017-10-10 11:52:38 +06:00
Saurabh
5ba4c4c49c Merge pull request #11132 from saurabh6790/upload_attendance_tool
[fix] upload attendance with with no_socketio param
2017-10-10 11:15:27 +05:30
tunde
37c2b6116c Merge branch 'develop' into payment-terms 2017-10-09 15:42:47 +01:00
Faris Ansari
172f28fa06 Merge pull request #11133 from netchampfaris/fix-hub-sync
fix Hub Sync plan
2017-10-09 19:31:08 +05:30
Faris Ansari
d635a2646b fix Hub Sync plan 2017-10-09 19:30:11 +05:30
Saurabh
f347e23556 [fix] upload attendacne with with no_socketio param 2017-10-09 16:13:21 +05:30
mbauskar
966b3c156a [conflicts] resolved merge conflicts 2017-10-09 15:20:30 +05:30
mbauskar
fbbb8695f3 Merge branch 'hotfix' 2017-10-09 15:18:52 +05:30
mbauskar
f9577652a0 bumped to version 9.1.2 2017-10-09 15:48:51 +06:00
tunde
e27f5dee1f Merge branch 'develop' into payment-terms 2017-10-09 10:11:05 +01:00
Rohit Waghchaure
d270748eea [Fix] Provision to select company in the POS screen if company is not defined in the global defaults 2017-10-09 12:54:26 +05:30
Doridel Cahanap
5ba39f3f83 Add has_certificate and level fields in Training Event (#11093) 2017-10-09 12:45:28 +05:30
tundebabzy
2622d370c6 deal zero division possibility (#11098) 2017-10-09 12:44:24 +05:30
rohitwaghchaure
e181dd4c24 [patch] To add healthcare domain (#11105) 2017-10-09 12:43:36 +05:30
tundebabzy
7f9d75521e Confirmation desired before cancelling appointment (#10996) (#11106)
* shows confirm dialog when user clicks cancel

* indentation and frm as per review
2017-10-09 12:43:18 +05:30
Makarand Bauskar
eaf0abedd4 [hotfix] ignore if student email address field value is None (#11116) 2017-10-09 12:42:18 +05:30
Manas Solanki
f91ad75b5a test, patch, docs for student admission (#11075) 2017-10-09 12:41:24 +05:30
tunde
1db7faa862 Merge branch 'develop' into payment-terms 2017-10-06 09:37:10 +01:00
Doridel Cahanap
5cb6c38a34 Add Calendar in Training Event Doctype (#11090) 2017-10-06 11:50:05 +05:30
rohitwaghchaure
6f5853b97a Merge pull request #11092 from rohitwaghchaure/pos_total_issue
Show total instead of net total
2017-10-06 11:17:24 +05:30
Rohit Waghchaure
62ce218fc2 Show total instead of net total 2017-10-06 11:16:46 +05:30
rohitwaghchaure
1b0f3ec666 Merge pull request #11089 from rohitwaghchaure/offline_pos_v9
[Fix] Discount field not displaying in offline POS
2017-10-06 09:51:30 +05:30
Rohit Waghchaure
beeba8b37a [Fix] Discount field not displaying in offline POS 2017-10-06 09:50:43 +05:30
rohitwaghchaure
d7636b2b19 Merge pull request #11083 from rohitwaghchaure/pos_print_format_issue
[fix] Online print format in pos profile field not displaying
2017-10-06 09:44:27 +05:30
Rohit Waghchaure
b870d0081b [fix] Online print format in pos profile field not displaying 2017-10-06 09:31:40 +05:30
tunde
d82677f1e6 Merge branch 'develop' into payment-terms 2017-10-06 02:23:45 +01:00
Nabin Hait
7eaeec951d Merge branch 'schilgod-develop' into develop 2017-10-05 19:54:17 +05:30
Nabin Hait
5a834209d0 Cleanup of PO schedule date pull requests 2017-10-05 19:51:10 +05:30
Faris Ansari
e3a5899980 [hub] Add hub category filters, fix minor issues (#11079) 2017-10-05 19:43:08 +05:30
Stavros Anastasiadis
455c3ebb27 Add as optional field link Company (#11068) 2017-10-05 18:45:37 +05:30
Stavros Anastasiadis
58b587834e Provide a minor warning message if no stock levels are availiable (#11074)
* Provide a minor warning message if no stock levels are availiable

* Update item_dashboard.js
2017-10-05 18:44:50 +05:30
Stavros Anastasiadis
e31757b001 Show Stock Level section only to stock maintain items (#11073) 2017-10-05 18:41:51 +05:30
rohitwaghchaure
e0dfd1608e [Fix] Auto add item in the cart if sinfle items found in the serach (#11072) 2017-10-05 18:30:51 +05:30
Nabin Hait
bf3b54f658 Merge branch 'schilgod-material_request' into develop 2017-10-05 18:30:11 +05:30
Nabin Hait
395cf4689b Cleanup of schedule date functionality in Material Request 2017-10-05 18:27:37 +05:30
Prateeksha Singh
925e9776e8 [hub] rename is_hub_item to is_item_from_hub (#11069)
* [hub] rename is_hub_item to is_item_from_hub

* [rename] is_hub_item to is_item_from_hub
2017-10-05 17:17:41 +05:30
AravindPranera
9c0d30a087 Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874) 2017-10-05 17:08:32 +05:30
Utkarsh Goswami
4cb4d2f155 Tests for payment entry against purchase invoice (#10930) 2017-10-05 16:51:42 +05:30
Utkarsh Goswami
975d28307a Payroll feature (#10900) 2017-10-05 15:59:51 +05:30
rohitwaghchaure
607b5d4985 [Fix] Negative qty issue in POS (#11070)
* [Fix] Negative qty issue in POS

* Update point_of_sale.js
2017-10-05 15:57:58 +05:30
Stavros Anastasiadis
ea390effa5 Add multirows in Attendees selection (#11067) 2017-10-05 15:31:25 +05:30
Nabin Hait
31e6f75dbf Merge branch 'Helkyd-develop' into develop 2017-10-05 15:29:05 +05:30
Nabin Hait
34ad2e6a60 Use format_currency only if fieldtype is currency 2017-10-05 15:28:43 +05:30
Nabin Hait
f8ad0cbe70 Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop 2017-10-05 15:02:50 +05:30
Manas Solanki
0518001bdc Changes in Student Admission (#11019)
* configurable student admission

* validate dob and admission date from student admission

* add in hooks and fix codacy
2017-10-05 14:31:31 +05:30
Doridel Cahanap
25db832be1 [minor] Add "Attendance" in grid view for Training Event Employee (#11063) 2017-10-05 14:20:43 +05:30
Makarand Bauskar
f23788bb7d [hotfix] Show Make button only for Email communication (#10876) 2017-10-05 14:19:45 +05:30
mbauskar
74ce391303 Merge branch 'master' into develop 2017-10-05 13:36:50 +05:30
mbauskar
671c6610de Merge branch 'hotfix' 2017-10-05 13:36:49 +05:30
mbauskar
8c3d19e2ab bumped to version 9.1.1 2017-10-05 14:06:49 +06:00
rohitwaghchaure
4a5ac7cea6 Merge pull request #11066 from rohitwaghchaure/pos_loading_issue
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
2017-10-05 13:34:22 +05:30
Rohit Waghchaure
f7a856b913 [Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm 2017-10-05 13:31:29 +05:30
Nabin Hait
26507d7867 Removed deprecated hub functions 2017-10-05 13:10:32 +05:30
Nabin Hait
d6d99e0d59 Removed duplicate field related to hub from Item 2017-10-05 12:39:42 +05:30
Nabin Hait
729aa2025a Show commission section for pos as well (#11059) 2017-10-05 12:21:36 +05:30
Nabin Hait
7d4fd35aa3 Add POS Settings link in Accounts module (#11060) 2017-10-05 12:20:33 +05:30
rohitwaghchaure
e87a076f1d Update link in the pos for offline and online mode from pos settings (#11061) 2017-10-05 12:20:20 +05:30
Faris Ansari
fd345f8e90 Hub (#10934)
* [WIP]Hub

* [listing] Show items, users and item_groups

* Show filters

* [start] cart, api for rfq and opp

* rfq working

* [wip] keys

* wip quotes

* [hub] register/unregister

* [hub] rename password to access_token, remove passed company field

* [hub] publishing cases, api call wrapper

* [hub] add and remove fields working

* [hub] fix flags, update on client save working

* [hub] new hub page, client item CUD at hub working

* listing, standard rate, local site hack

* item listing, item page, search, back to home

* [hub] implement hub company

* [hub] company filter

* [hub] basic rfq-ing, item page cleanup

* categories wip

* [hub] use get_doc_before_save()

* [hub] send opportunity message to hub, api to make locally

* [hub] enqueueing in hub api request wrapper

* cleanup

* [hub] refactor shopping cart's product.py to reuse

* sync dynamic item fields daily

* Scheduler heartbeat check

* [wip] hub categories

* [hub] wip enqueued callbacks

* [hub] outgoing messages, fixing callback loop

* [hub] bug: callback save after primary save

* [hub] pricing, stock, currency

* [hub] replace send_hub_request with make_and_enqueue

* add hub.less, refactor code

* Remove template html files, add styling for hub item cards

* fix paging

* add breadcrumb

* Add sidebar

* [hub] add company page, change country

* [hub] order_by filters

* [hub] make hub category a tree

* [hub] enqueue batched item enqueueing

* [hub] requested products page

* [minor]

* update hub url

* [fix] url

* [fix] more reform

* fix recursion

* [hub] data migration plans as jsons

* Hub register, create data connector, sync with run

* [add] user registration by session user

* Removed hub_message

* Remove sync code from hub_settings

* Remove hub methods from item.py

* Update Hub Sync plan

* Hub unregister

* Update Hub connector on reregister

* Dont delete Hub Connector on unregister

* Enable hub on success response

* Add new hub whitelisted methods

* [hub] list working

* Hub register from hub page

* [hub] Add hub logo in desk icon, link to page

* [hub] hide page head on empty state

* [hub] make rfq

* [hub] push opportunity doc, poll for opportunity docs

* add fields to item mapping

* update hub mappings

* Make RFQ

* [hub] item, home routing

* Make rfq and send opportunity refactor

* [hub][fix] remote lead data

* images passed as base64

* set default company on register

* Revert "images passed as base64"

This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.

* Add sync to hub page

* Prompt for publish items to hub

* add post process to hub document to lead

* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +05:30
Nabin Hait
ff689a658f Merge branch 'staging' 2017-10-04 18:21:35 +05:30
Nabin Hait
b290e3a4e7 bumped to version 9.1.0 2017-10-04 18:51:34 +06:00
Nabin Hait
77f0822abe Merge branch 'develop' into staging 2017-10-04 18:11:16 +05:30
Nabin Hait
f83bc51e81 Merge branch 'master' into staging 2017-10-04 18:05:21 +05:30
Nabin Hait
fc712aea32 Merge branch 'master' into develop 2017-10-04 18:05:20 +05:30
Nabin Hait
7105c4b76c Merge branch 'hotfix' 2017-10-04 18:05:19 +05:30
Nabin Hait
54c725dcd1 bumped to version 9.0.9 2017-10-04 18:35:19 +06:00
rohitwaghchaure
1e2c554e61 [Fix] Stock entry multi uom batch validation issue (#11049) 2017-10-04 17:52:49 +05:30
tundebabzy
65dfd09947 fix wrong variable name (#11050) 2017-10-04 17:51:44 +05:30
Javier Wong
61287e3c53 [fix] Change Sample Item Error Message to Zero Valuation Rate (#10935)
Change Sample Item Error Message to Zero Valuation Rate
2017-10-04 16:01:34 +05:30
Makarand Bauskar
1b67d71139 [minor] add the Lead in email account -> append_to field (#10983) 2017-10-04 15:55:56 +05:30
Doridel Cahanap
32456b0f14 [minor edits] BOM Stock Report (#11012)
* HTML for BOM Stock Report to show filters in PDF

* Added BOM Stock Report in Manufacturing Config under Report
2017-10-04 15:54:44 +05:30
Nabin Hait
3d0d4b2157 update subscription period only if relevant date field exists (#11046) 2017-10-04 15:51:55 +05:30
Nabin Hait
7e5a9f5c0e Update new bom rate while replacing BOM (#11045) 2017-10-04 15:51:34 +05:30
KanchanChauhan
d3e21fff66 [Minor] Employee name as standard filter (#11043) 2017-10-04 15:20:34 +05:30
Nabin Hait
5171956646 Merge branch 'master' into staging 2017-10-04 14:52:33 +05:30
Nabin Hait
0cc93538ed Merge branch 'hotfix' 2017-10-04 14:52:32 +05:30
Nabin Hait
b779644493 Merge branch 'master' into develop 2017-10-04 14:52:32 +05:30
Nabin Hait
c83e793ce8 bumped to version 9.0.8 2017-10-04 15:22:31 +06:00
Revant Nandgaonkar
4d68e03a97 [Fix] Job Opening Web Form breadcrumb (#11029) 2017-10-04 14:35:21 +05:30
Makarand Bauskar
eaec4695f7 [hotfix] filter doctype if the doctype has subscription field (#11038) 2017-10-04 14:34:45 +05:30
rohitwaghchaure
5049edb494 [Fix] Discount and serial no search issue (#11040) 2017-10-04 14:33:12 +05:30
Makarand Bauskar
d17bea0a31 [hotfix] check minimum actual start time and actual end time before updating PO Operations (#11041)
* [hotfix] check minimum actual start time and actual end time before updating PO Operations

* Update production_order.py
2017-10-04 14:30:12 +05:30
Saurabh
444bfff1ff [fix] resolved merge conflicts 2017-10-03 18:03:18 +05:30
Saurabh
ee4a2dd26f [fix] resolved merge conflicts 2017-10-03 18:02:09 +05:30
Saurabh
f6580268e6 Merge branch 'hotfix' 2017-10-03 18:00:32 +05:30
Saurabh
e3a468ed1b bumped to version 9.0.7 2017-10-03 18:30:31 +06:00
rohitwaghchaure
9e6f2a49e8 Merge pull request #11033 from rohitwaghchaure/subscription_next_data_fix
[Fix] Subscription next schedule date, cancel issue, added from and to date
2017-10-03 17:48:53 +05:30
Rohit Waghchaure
445e8a2e57 [Fix] Subscription end date, cancel issue, added from and to date 2017-10-03 17:45:11 +05:30
tunde
19e63b73ed Merge branch 'develop' into payment-terms 2017-10-03 12:02:38 +01:00
Nabin Hait
7b6eaee05b Fixes to handle async events (#11018)
* Fixes to handle async events

* transaction.js code cleanup

* Don't map taxes and charges while making PO from SO for drop-ship

* Removed print
2017-10-03 01:09:46 +05:30
rohitwaghchaure
c26e3f1569 Merge pull request #11024 from rohitwaghchaure/payment_issue_in_pos
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 22:29:49 +05:30
Rohit Waghchaure
c4e52e5f95 [Fix] Old invoice payment amount showing in the payment modal while making payment 2017-10-02 21:20:54 +05:30
Nabin Hait
7eba1a35d3 Controller init args fix (#11015)
* Controller init args fix

* cleanup useless code
2017-10-02 15:59:27 +05:30
Nabin Hait
1f10d693e9 Don't set currency as company currency if default currency is different (#11011) 2017-10-02 13:20:51 +05:30
Nabin Hait
53e8989699 Merge branch 'master' into staging 2017-10-02 12:28:27 +05:30
Nabin Hait
8919669ac2 Merge branch 'master' into develop 2017-10-02 12:28:27 +05:30
Nabin Hait
d977333a99 Merge branch 'hotfix' 2017-10-02 12:28:26 +05:30
Nabin Hait
3a2834c7ad bumped to version 9.0.6 2017-10-02 12:58:26 +06:00
rohitwaghchaure
88491715e0 [Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005) 2017-10-02 12:13:36 +05:30
Nabin Hait
0bdf1e5ef1 Merge branch 'master' into staging 2017-10-02 12:09:01 +05:30
Nabin Hait
f059e7be35 Merge branch 'master' into develop 2017-10-02 12:09:00 +05:30
Nabin Hait
00a48ad4e5 Merge branch 'hotfix' 2017-10-02 12:09:00 +05:30
Nabin Hait
def308a433 bumped to version 9.0.5 2017-10-02 12:38:59 +06:00
Makarand Bauskar
cb38e599e5 [minor] don't create lead if customer contact is already created against contact_email (#10976)
* [minor] don't create lead if customer contact is already created against contact_email

* [tests] added tests cases for opportunity to check if lead is required or not
2017-10-02 11:40:43 +05:30
Nabin Hait
9b98d7fa14 Gst doctype roles (#10984)
* Removed default permission from GST doctypes

* default permission from GST doctypes
2017-10-02 11:38:40 +05:30
Makarand Bauskar
b1bf502119 [hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' (#11007) 2017-10-02 11:38:03 +05:30
Nabin Hait
cb48404bd2 Revert "Fixes for uom in get_item_details (#10986)" (#11009)
This reverts commit 5b58e489a8.
2017-10-02 11:37:18 +05:30
Nabin Hait
5b58e489a8 Fixes for uom in get_item_details (#10986) 2017-10-02 11:36:10 +05:30
Sunny
38647ed832 move Purchase Order patch to v9 2017-10-02 11:37:48 +08:00
Sunny
42c74a6365 set schedule_date when creating po 2017-10-02 11:37:48 +08:00
Sunny
c6f25ba996 correct field name 2017-10-02 11:37:47 +08:00
Sunny
b387b3cca0 [fix] tests 2017-10-02 11:37:47 +08:00
Sunny
a456901e9f [fix] Codacy errors 2017-10-02 11:37:47 +08:00
Sunny
0f2b21f88b Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:37:47 +08:00
Sunny
73f4eef40f [fix] tests 2017-10-02 11:37:47 +08:00
Sunny
9ded8a7290 [fix] Codacy errors 2017-10-02 11:37:47 +08:00
Sunny
c2befc59d1 Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:37:47 +08:00
Sunny
34a8fb4100 [fix] Codacy errors 2017-10-02 11:37:47 +08:00
Sunny
47eac28f0a Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:37:47 +08:00
Sunny
869b878286 set schedule_Date when creating po 2017-10-02 11:36:24 +08:00
Sunny
f2e2e23b6b [fix] tests 2017-10-02 11:35:33 +08:00
Sunny
3a22fd1535 Add schedule_date when creating Purchase Order 2017-10-02 11:35:33 +08:00
Sunny
f07e53b7a8 [fix] tests 2017-10-02 11:35:33 +08:00
Sunny
bd121486a8 [fix] Codacy errors 2017-10-02 11:35:33 +08:00
Sunny
122981d465 Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:35:33 +08:00
Sunny
962cef470a Set PO Reqd By Date default in code, to next date 2017-10-02 11:35:33 +08:00
Sunny
0f73f90fa2 [fix] Codacy errors 2017-10-02 11:35:33 +08:00
Sunny
69e88ffa39 Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:35:33 +08:00
schilgod
f29969a5cc update test records 2017-10-02 11:35:32 +08:00
Sunny
e3ed8b7cb3 [fix] tests 2017-10-02 11:35:32 +08:00
Sunny
9626ed79fa Add patch to update schedule date of submitted Purchase Orders 2017-10-02 11:35:32 +08:00
Sunny
c429a6e688 [fix] Codacy errors 2017-10-02 11:35:32 +08:00
Sunny
2315a79b5f Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:35:32 +08:00
Sunny
9da25f568d Set PO Reqd By Date default in code, to next date 2017-10-02 11:35:32 +08:00
Sunny
9d497a984b [fix] Codacy errors 2017-10-02 11:35:32 +08:00
Sunny
bb03ec103b Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-10-02 11:35:32 +08:00
Helkyd
4c58588d25 Improve Salary Register
Check if fieldname is a number to format.

Start the Html Salary with hidden fields and check if they not empty and increase the width...
This will remove Blank fields from the report.
2017-10-01 20:20:57 +01:00
Rushabh Mehta
4b99fe15cc [version] 9.x.x-develop 2017-09-30 11:41:26 +05:30
Rushabh Mehta
b9fe14631d [fix] healthcare setup 2017-09-30 10:46:56 +05:30
Nabin Hait
01b96a0e31 Fixes for uom in get_item_details 2017-09-29 18:57:41 +05:30
Nabin Hait
79a1d2a3b0 Fixes for uom in get_item_details 2017-09-29 18:15:40 +05:30
tunde
c49e748c85 Merge branch 'develop' into payment-terms 2017-09-29 13:30:22 +01:00
Nabin Hait
f65e55064b Fixed ui tests for production order 2017-09-29 12:50:37 +01:00
Nabin Hait
6488645d42 Fixed ui tests for production order 2017-09-29 16:38:28 +05:30
Rushabh Mehta
b46900a4cb Merge branch 'master' into staging 2017-09-29 16:22:02 +05:30
Rushabh Mehta
912ae24ca2 Merge branch 'master' into develop 2017-09-29 16:22:02 +05:30
Rushabh Mehta
e292c83114 Merge branch 'hotfix' 2017-09-29 16:22:01 +05:30
Rushabh Mehta
e1a4b3e4bc bumped to version 9.0.4 2017-09-29 16:52:01 +06:00
Faris Ansari
8ac56b26e0 [Enhancement] Allow Multiple users in POS Profile 2017-09-29 16:15:15 +05:30
Rushabh Mehta
d3a48a83fd [fix] bom.py, dont use keyword 2017-09-29 15:50:17 +05:30
Rushabh Mehta
80d24f83f8 [fix] item variant description 2017-09-29 15:39:03 +05:30
Pawan Mehta
5d8fd477bd [fix] #10840 (#10844) 2017-09-29 15:23:54 +05:30
Javier Wong
bf37995745 [Enhancement] Sales and Purchase Default UOM (#10929)
Option for specifying an optional default Sales and Purchase UOM at the item master level.
2017-09-29 15:23:08 +05:30
tundebabzy
5510d0751d correctly set frm company currency (#10944) 2017-09-29 15:21:59 +05:30
Shreya Shah
b79c4a9ff6 Getting last purchase price of an item (#10897)
* Added a column last purchase rate

* Removed button last purchase rate

* Get last purchase rate on adding an item

* Added test case for last purchase rate

* Replaced cur_frm with frm

* Update purchase_order.js
2017-09-29 15:20:48 +05:30
Francisco Roldán
1b61dfd9ea translated (#10886) 2017-09-29 15:19:12 +05:30
Shridhar Patil
3f7d96ecba Unassign from todo. (#10896)
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Faris Ansari
367b90e3ae Add Data Import Tool desktop icon (#10916)
fixes #8332
2017-09-29 15:17:48 +05:30
tunde
25275077ab Merge branch 'develop' into payment-terms 2017-09-29 10:47:01 +01:00
Nabin Hait
945f502748 Fixes for updating item variant from template (#10975)
* Fixes for updating item variant from template

* More fixes for test cases
2017-09-29 15:11:50 +05:30
Makarand Bauskar
9c339145b2 [Enhance] Custom notification messages for subscription documents (#10970)
* [minor] configurable subscription email message and subject for notification

* [minor] added description for subject field
2017-09-29 15:02:51 +05:30
tunde
3415ac6e9c Merge branch 'develop' into payment-terms 2017-09-29 10:10:24 +01:00
Rushabh Mehta
3c14c5a16c [fix] tax_rule.py args 2017-09-29 13:21:22 +05:30
Nabin Hait
bdb4c542e7 default permission from GST doctypes 2017-09-29 10:39:32 +05:30
Nabin Hait
6d61a45f42 Removed default permission from GST doctypes 2017-09-29 10:35:21 +05:30
tunde
21e371f65f use chromedriver 3.2 2017-09-28 14:57:41 +01:00
Nabin Hait
c314485d55 Fixes based on test case 2017-09-28 18:55:49 +05:30
Nabin Hait
3b04cfc812 minor fix 2017-09-28 18:55:49 +05:30
tunde
131f0104b0 fix production order ui test 2017-09-28 14:08:25 +01:00
mbauskar
79ba422273 Merge branch 'develop' into staging 2017-09-28 16:32:33 +05:30
tunde
18764a12c4 increase point-of-sale timeout to fix UI test 2017-09-28 11:47:27 +01:00
rohitwaghchaure
0dc3c1b114 Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo
[minor] Added batch item in the demo data
2017-09-28 16:07:01 +05:30
schilgod
0f6fff6f0c item price track_changes default to 1 (#10958) 2017-09-28 15:28:59 +05:30
Rushabh Mehta
2b87d100fa [fix] https://github.com/frappe/erpnext/issues/10956 2017-09-28 15:21:36 +05:30
Rohit Waghchaure
c4ee77a3cc [minor] Added batch item in the demo data 2017-09-28 15:19:26 +05:30
tunde
d348c12bdb fix sales order ui test 2017-09-28 09:46:31 +01:00
Sunny
3ec6960478 move Material Request patch to v9 2017-09-28 15:26:20 +08:00
Sunny
33670bba47 fix reorder_item 2017-09-28 15:24:11 +08:00
Sunny
73f1c93cd2 fix ppt code 2017-09-28 15:24:11 +08:00
Sunny
bf68611567 clean code 2017-09-28 15:24:11 +08:00
Sunny
0d91d3f572 add schedule_date while creating Material Request 2017-09-28 15:23:52 +08:00
Sunny
892ec599d4 [fix] tests 2017-09-28 15:23:09 +08:00
Sunny
65cd9f2284 Add patch to update schedule date of submitted Purchase Orders 2017-09-28 15:23:09 +08:00
Sunny
799d69baba [fix] Codacy errors 2017-09-28 15:22:49 +08:00
Sunny
71866e06f3 Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-09-28 15:22:49 +08:00
Sunny
284ceb7abe Set PO Reqd By Date default in code, to next date 2017-09-28 15:22:49 +08:00
Sunny
65c7a6947a [fix] Codacy errors 2017-09-28 15:22:49 +08:00
Sunny
f7a8277d12 Add Purchase Order schedule_date field, similar to delivery_date in Sales Order 2017-09-28 15:22:49 +08:00
Sunny
12cb07ce3c [fix] test records 2017-09-28 15:22:49 +08:00
Sunny
23a4b09d43 Add Material Request schedule_date field, similar to delivery_date in Sales Order 2017-09-28 15:22:48 +08:00
Nabin Hait
c9f9e5235b Fixed merge conflict 2017-09-28 12:31:33 +05:30
Nabin Hait
edd4fd4692 Merge branch 'hotfix' 2017-09-28 12:30:48 +05:30
Nabin Hait
ca916a73de bumped to version 9.0.3 2017-09-28 13:00:48 +06:00
Makarand Bauskar
53e19075d1 [hotfix] fixes and refactored Quoted Item Comparison report (#10954) 2017-09-28 12:30:04 +05:30
Rushabh Mehta
a0ba5594f9 [fix] production_order.py via error report 2017-09-28 11:26:24 +05:30
rohitwaghchaure
16645803f9 [fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports (#10872) 2017-09-28 11:05:03 +05:30
rohitwaghchaure
94799a8b93 [fix] ‘NoneType’ object is not iterable onload of POS (#10941) 2017-09-28 10:56:27 +05:30
Nabin Hait
fce14fdcf0 Fixed merge conflict 2017-09-27 17:21:21 +05:30
Nabin Hait
7baacb7f74 Merge branch 'hotfix' 2017-09-27 17:19:55 +05:30
Nabin Hait
76615c8001 bumped to version 9.0.2 2017-09-27 17:49:55 +06:00
Prateeksha Singh
283922daa2 [fix] Check for stock_qty, else use qty (#10937) 2017-09-27 17:12:28 +05:30
rohitwaghchaure
da8de2f0c7 Re-order patch sequence (#10936) 2017-09-27 17:11:40 +05:30
rohitwaghchaure
0060993eab Merge pull request #10931 from rohitwaghchaure/customer_group_issue_for_lead
[fix] 'NoneType' object is not iterable while saving quotation
2017-09-27 16:08:35 +05:30
Rohit Waghchaure
566a0a05c8 [fix] 'NoneType' object is not iterable while saving quotation 2017-09-27 15:57:48 +05:30
Rushabh Mehta
f702d72c35 [minor] [performance] push hsn code creation after setup (#10928) 2017-09-27 15:31:30 +05:30
Nabin Hait
76e1ca35ad Merge branch 'master' into develop 2017-09-27 13:05:21 +05:30
Nabin Hait
e0a845c356 Merge branch 'hotfix' 2017-09-27 13:05:20 +05:30
Nabin Hait
eb686f8b1a bumped to version 9.0.1 2017-09-27 13:35:20 +06:00
Brown-Harry Boma
d3fa19143d Properly redirect supplier after quotations submit (#10903) 2017-09-27 12:53:38 +05:30
Makarand Bauskar
70eaf2da95 [minor] removed the default precision for the margin_rate_or_amount field (#10923) 2017-09-27 12:49:16 +05:30
rohitwaghchaure
103b239a31 Merge pull request #10925 from rohitwaghchaure/pos_issues_v9
[fix] Discount amount not working for POS
2017-09-27 12:20:30 +05:30
Rohit Waghchaure
87e994e0a2 [fixed] Disocunt amount not working for POS 2017-09-27 12:16:58 +05:30
rohitwaghchaure
45d45f4247 [hotfix] Wrong calculation of total in taxes and totals (#10924) 2017-09-27 11:49:13 +05:30
Prateeksha Singh
946e182564 install company fixtures while creating company (#10904)
* install company fixtures while creating company

* [fix] remove from setup_complete
2017-09-27 11:44:39 +05:30
tunde
567119170e Merge branch 'develop' into payment-terms 2017-09-26 17:28:07 +01:00
Frappe PR Bot
9aff73d156 [Translation] Updated Translations (#10901) 2017-09-26 17:18:42 +05:30
Prateeksha Singh
df8fbd7d72 [fix] batch qty checked against stock_qty field (#10906) 2017-09-26 17:16:03 +05:30
Nabin Hait
51a07d19c8 Merge branch 'master' into develop 2017-09-26 15:59:15 +05:30
Nabin Hait
8ff0a64ac2 Merge branch 'staging' 2017-09-26 15:59:12 +05:30
Nabin Hait
c0b4f0e81b bumped to version 9.0.0 2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f Set bill no while making payment entry from purchase invoice 2017-09-26 15:56:58 +05:30
tunde
79f9a4aef1 bug fix: sales invoice always dirty even after reloading 2017-09-26 10:39:30 +01:00
tunde
095cfc9cfc disable some Payment Schedule fields 2017-09-26 10:25:49 +01:00
tunde
9e4dcdfbc8 rename Payment Terms Schedule section break to Payment Terms 2017-09-26 09:44:23 +01:00
rohitwaghchaure
d4c2d77bba [fix] POS not working if user clicks on back button from form view (#10912) 2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3 [setup] remove translations from action name (#10911) 2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1 change log for version 9 2017-09-26 12:41:43 +05:30
tunde
192587fe56 UI test cases 2017-09-26 01:32:08 +01:00
tunde
c4b0d17c08 fix bug: can't make PE for invoice with multi due date 2017-09-26 01:02:43 +01:00
tunde
31ddbe36c0 fix bug: cast to flt 2017-09-25 23:24:32 +01:00
tunde
541d3f9567 fix ui tests 2017-09-25 18:15:47 +01:00
tunde
cd9bc6f795 fix failing test 2017-09-25 14:51:21 +01:00
tunde
94c3c13ba6 fix failing tests 2017-09-25 14:47:48 +01:00
Nabin Hait
afe9eabd3c Merge branch 'master' into develop 2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18 Merge branch 'master' into staging 2017-09-25 16:36:47 +05:30
Nabin Hait
a0b85cd1ec Merge branch 'hotfix' 2017-09-25 16:36:45 +05:30
Nabin Hait
9ef023b10f bumped to version 8.11.6 2017-09-25 17:06:44 +06:00
Nabin Hait
0d0811ca14 reload print style 2017-09-25 16:33:45 +05:30
Nabin Hait
39c2f75e6d Merge branch 'master' into staging 2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f Merge branch 'master' into develop 2017-09-25 16:03:31 +05:30
Nabin Hait
3ab938ea34 Merge branch 'hotfix' 2017-09-25 16:03:29 +05:30
Nabin Hait
7da3c46ef2 bumped to version 8.11.5 2017-09-25 16:33:29 +06:00
tunde
90e09d4e79 fix failing tests from shopping cart 2017-09-25 11:27:32 +01:00
tunde
8a53b64ac4 Merge branch 'develop' into payment-terms 2017-09-25 10:31:42 +01:00
tunde
9bed2de726 show all duplicate rows after checking for duplicate due date 2017-09-25 10:19:35 +01:00
tunde
e52bb825ec fix bug: form is always dirty 2017-09-25 09:02:23 +01:00
Nabin Hait
3b61552836 Revert "Advance against expense claim (#10632)" (#10877)
This reverts commit cdd6ded790.
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d reload print style 2017-09-23 15:50:39 +05:30
tunde
77ecacc379 validation to check for possible duplicate payment terms 2017-09-22 23:12:55 +01:00
tunde
cf42d1db5c more tests 2017-09-22 17:20:33 +01:00
tunde
3aec78b472 make due date, invoice_portion mandatory 2017-09-22 16:22:15 +01:00
tunde
e6b3fe1215 add tests for payment term template 2017-09-22 16:04:07 +01:00
tunde
d6cf6fb124 documentation for payment terms 2017-09-22 15:49:02 +01:00
tunde
62af5c5693 more validation checks and test fixes 2017-09-22 15:16:38 +01:00
tunde
73a83a472d validation for Payment Terms Template 2017-09-22 11:05:40 +01:00
tunde
25cda29007 fix test Employee 2017-09-21 14:33:39 +01:00
tundebabzy
e4be3f8dc9 use generator when updating and notify user of long process (#10777) 2017-09-21 18:27:33 +05:30
tunde
d7d306bfdb fix final failing test 2017-09-21 13:43:38 +01:00
Nabin Hait
cdd6ded790 Advance against expense claim (#10632)
* Adds Whitelist Method for Advance Entry

* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date

* Adds changes for managing advance payments using Default Account and Party

* Removed console.log from the JS file

* Advance Payment Patch - Fixed Codacy errors

* Removed stray file

* Fixed conflicts due to changes in upstream

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed pending Codacy error

* Updated JS code by removing cur_frm which is soon to be deprecated

* Advance against Expense Claim: cleanup and fixes

* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933 set total in tax table if category not valuation and consider deductions (#10870) 2017-09-21 16:15:30 +05:30
Nabin Hait
fb142f5283 Merge branch 'AravindPranera-develop' into develop 2017-09-21 15:52:06 +05:30
Nabin Hait
6d78f7b862 Fixed indentation 2017-09-21 15:51:42 +05:30
tunde
82de375ba0 Merge branch 'develop' into payment-terms 2017-09-21 11:21:05 +01:00
Nabin Hait
5478a7fa67 Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop 2017-09-21 15:48:18 +05:30
tunde
951092eecd fix sales order and pricing rule failing tests 2017-09-21 11:14:53 +01:00
Nabin Hait
2851dfad99 Set fields in Item Variant Settings which should be copied from template to variant 2017-09-21 15:41:57 +05:30
Rohit Waghchaure
5b05335e89 added patch and set default fields after completion of setup wizard 2017-09-21 15:41:57 +05:30
Rohit Waghchaure
0e28fccb34 [Enahance] Update variants fields defined in the Item Varianst Settings, if template updated 2017-09-21 15:41:57 +05:30
tunde
99849f8eab fix failing tests 2017-09-21 10:23:40 +01:00
tundebabzy
ab5b03011d Enhance Currency Exchange Management (#10482)
* add new settings in Accouts Settings

* patch for new settings

* refactor `get_exchange_rate`

* adds validation

* tests validation

* disables conversion rate field if stale rates not allowed

* more test cases

more test case...

test `get_exchange_rate` behaviour with stale not allowed in sett..

fix currency exchange test case

do housekeeping after running accounts settings test

* clean up

* documentation

* make use of correct api url

* Fix tests failing due to wrong exchange rate from fixer.io

* remove mandatory constraint from `allow_stale`

* added info to documentation
2017-09-21 14:50:39 +05:30
rohitwaghchaure
12fd8a6047 [fix] User not able to complete the production order because of decimal issue (#10868) 2017-09-21 14:39:10 +05:30
Nabin Hait
24ec3c7dcb Fixed merge conflict 2017-09-21 12:53:41 +05:30
tunde
ae0eb718a3 Merge branch 'develop' into payment-terms 2017-09-21 08:12:23 +01:00
Vishal Dhayagude
c4c2c56af2 env variable added (#10847) 2017-09-21 12:07:56 +05:30
Prateeksha Singh
705d885b64 [progress] R/W permission for all roles (#10866) 2017-09-21 12:02:18 +05:30
Manas Solanki
1c1dd08a34 only validate party account and ref doc party account in selected case (#10863)
* only validate party account and ref doc party account in selected case

* fix for fee structure test

* fix the assessment result test
2017-09-21 12:01:20 +05:30
tunde
c02f332565 Merge branch 'develop' into payment-terms 2017-09-20 15:37:34 +01:00
tunde
35c84fe4f2 fix failing test case 2017-09-20 12:26:19 +01:00
Nabin Hait
b2dca79d89 Updated modified timestamp in sales/purchase transaction doctypes 2017-09-20 09:56:06 +05:30
tunde
4712ed6377 remove logging statement 2017-09-19 21:30:34 +01:00
tunde
3387d026b1 Merge branch 'develop' into payment-terms 2017-09-19 18:07:12 +01:00
tunde
da17954919 fix failing tests 2017-09-19 17:53:31 +01:00
Nabin Hait
6960a76adc Fixes related to schools fees 2017-09-19 17:23:03 +05:30
Manas Solanki
0664d6ed8b real time fee creation status via socketio 2017-09-19 17:23:03 +05:30
Manas Solanki
1bcc6c661a minor changes 2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32 add the fee schedule in config 2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85 cleanup of the fee module 2017-09-19 17:23:03 +05:30
Manas Solanki
8c88af23ef added the test case for the fees 2017-09-19 17:23:03 +05:30
Manas Solanki
d1d2633658 removed the fee schedule 2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb fixes as per the review 2017-09-19 17:23:03 +05:30
Manas Solanki
49c52f7639 renamed one doctype to the fee schedule 2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79 make payment entry for the fees 2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5 make gl_entry on submission of fees 2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5 make payment request for the fee 2017-09-19 17:23:02 +05:30
Manas Solanki
f073814635 added fee request doctype 2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6 Rounding Adjustment via a separate field, instead of last tax row (#10659)
* Rounding Adjust via a separate field, instead of last tax row

* Fixed test cases
2017-09-19 14:53:16 +05:30
rohitwaghchaure
f551b43a94 Merge pull request #10841 from rohitwaghchaure/subscription_patch_fix_docststus
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 13:24:04 +05:30
Rohit Waghchaure
c15a3bd379 [fix] Subscription patch broken if reference document has been cancelled 2017-09-19 12:53:11 +05:30
Nabin Hait
caf9891075 Fixed merge conflict 2017-09-19 12:06:22 +05:30
Nabin Hait
bd4b80e3d8 Merge branch 'master' into develop 2017-09-19 12:05:41 +05:30
Nabin Hait
9930eb0a7a Merge branch 'hotfix' 2017-09-19 12:05:39 +05:30
Nabin Hait
703e837125 bumped to version 8.11.4 2017-09-19 12:35:39 +06:00
rohitwaghchaure
4f0f144142 Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop
Cherry pick staging to develop for subscription cleanup
2017-09-19 10:26:20 +05:30
Nabin Hait
cf36534eed Gross profit report considering returned items (#10734) 2017-09-18 19:13:45 +05:30
AravindPranera
cb6774e373 Files added with all functions 2017-09-18 17:37:37 +05:30
AravindPranera
1276893550 Files added with all functions 2017-09-18 17:30:20 +05:30
rohitwaghchaure
d02744b436 [fix] Subscription patch (#10827) 2017-09-18 17:23:00 +05:30
rohitwaghchaure
850eaa73b0 Move subscription module to accounts (#10772) 2017-09-18 17:23:00 +05:30
Nabin Hait
e859671eb3 Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)" (#10830)
This reverts commit d258372f9e.
2017-09-18 17:22:46 +05:30
Neil Trini Lasrado
d258372f9e Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706) 2017-09-18 17:12:16 +05:30
tundebabzy
f6d738b3c5 Delivery note to billing issue (#10726) (#10766)
* allow invoices to be made from sales returns

* Update queries.py
2017-09-18 17:10:09 +05:30
Utkarsh Goswami
b98359f4a7 Payment entry (#10668) 2017-09-18 17:06:13 +05:30
Makarand Bauskar
5c1d15f015 [change-log] added change log for v9.0.0 (#10756)
* [change-log] added change log for v9.0.0

* Update v9_0_0.md
2017-09-18 17:03:21 +05:30
Manas Solanki
a22c94c246 refactored assessment result tool (#10633)
* save the assessment instead of submit

* Added comments in the artool

* remove the cur_frm and message for submitted result

* link field for the assessment result
2017-09-18 16:59:54 +05:30
Faris Ansari
aebcb17daf Show thumbnail image in daily work summary (#10605)
* Show thumbnail image in daily work summary

* Crop thumbnail image into square

* fix codacy
2017-09-18 16:58:24 +05:30
rohitwaghchaure
6cea73b834 [fix] Subscription patch (#10827) 2017-09-18 16:58:05 +05:30
Utkarsh Goswami
bd0beb6c02 [fix] unknown column in production order (#10828) 2017-09-18 16:48:45 +05:30
Utkarsh Goswami
e78d5a240a [fix] unknown column in production order (#10828) 2017-09-18 16:44:11 +05:30
Neil Trini Lasrado
de3429280b Made Template link in variant (Item Master) intro linkable (#10696)
* Made Template link in variant (Item Master) intro linkable

* Update item.js
2017-09-18 16:42:10 +05:30
Neil Trini Lasrado
8c9f2a1be6 Add communication entry to Sales Order only if payment entry email is sent to customer (#10716) 2017-09-18 16:41:49 +05:30
Prateeksha Singh
9b4f3cf9de Leaderboard cleanup (#10638)
* [leaderboard] wip

* [leaderboard] filter for selecting leaderboard criteria, single col

* [leaderboard] doctypes in sidebar

* hide graph if no results
2017-09-18 16:41:04 +05:30
tunde
9448f4b13c codacy corrections 2017-09-18 12:08:34 +01:00
tunde
4bf3ed47ff revert from trying to adjust payment schedule based on old recurring_document 2017-09-18 11:54:28 +01:00
Saurabh
0396674d0d Merge pull request #10826 from saurabh6790/salary_struct_fix_1
Salary struct fix
2017-09-18 16:18:35 +05:30
Saurabh
9c334c34a6 [fix]remove employee field from tab salary structure 2017-09-18 16:17:13 +05:30
Manas Solanki
e716da04ec add the newsletter in the standard portel (#10784) 2017-09-18 16:00:34 +05:30
Saurabh
590d401e5f [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt (#10793)
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt

* Update bom.js

* Update stock_entry.py
2017-09-18 15:49:19 +05:30
ci2014
9bc197cfd5 Update project.js (#10796)
* Update project.js

Move indicators to setup to be less buggy

* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Saurabh
d7e1869a70 [fix] if item code not exists then exclude item in validate_selling_price (#10800) 2017-09-18 15:43:35 +05:30
Saurabh
3f15bf9828 [fix] query fix for match conditions (#10810) 2017-09-18 15:27:24 +05:30
Nabin Hait
9744aa21af Minor fix in tax rule 2017-09-18 15:25:33 +05:30
Adam Dawoodjee
91eda6dad4 Update creating-custom-link-field.md (#10822)
Grammer improvements
2017-09-18 15:11:57 +05:30
Zarrar
8f957ef6e6 fetching data from last route (#10816) 2017-09-18 15:11:20 +05:30
Utkarsh Goswami
11bd5fc3b1 Description moved next to item code (#10820) 2017-09-18 15:05:50 +05:30
Saurabh
2222f10720 [patch] remove employee name salary structure (#10817)
* [patch] remove employee name salary structure

* Update remove_employee_from_salary_structure_parent.py
2017-09-18 15:05:18 +05:30
Nabin Hait
bc9006ff30 Delete GST related doctypes and reports if account is from outside India (#10808) 2017-09-18 13:16:04 +05:30
rohitwaghchaure
70ef09aa8f Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue
[fix] Test cases for tax rule
2017-09-16 22:55:16 +05:30
Rohit Waghchaure
2cb2064c6f Fixed test cases tax rule 2017-09-15 23:10:27 +05:30
Nabin Hait
21617da619 More fixes for UI tests 2017-09-15 21:22:16 +05:30
Nabin Hait
628ca2a2ec Minor fix for ui tests 2017-09-15 19:35:12 +05:30
Nabin Hait
46941e8b35 Time out increased for appraisal template 2017-09-15 18:56:49 +05:30
Prateeksha Singh
d1ce7bfff4 [fix] set item valuation rates (#10681) 2017-09-15 16:17:29 +05:30
rohitwaghchaure
dd092e30fb Move subscription module to accounts (#10772) 2017-09-15 16:16:36 +05:30
Makarand Bauskar
5ac01a2bf7 [minor] translate the action name in get_slide_settings (#10740) (#10790) 2017-09-15 12:10:29 +05:30
AravindPranera
27bbb561d2 removed whitespace 2017-09-15 11:04:14 +05:30
AravindPranera
2c1f44ecfa Trailing space removed in line 275 2017-09-15 10:57:23 +05:30
AravindPranera
c73383c34c Trailing whitespace in Line 207 and 276 2017-09-15 10:34:21 +05:30
Nabin Hait
43268bd350 Fixed salary structure tests 2017-09-14 19:39:10 +05:30
Nabin Hait
2f64f0f5fa Fixed salary structure tests 2017-09-14 19:08:15 +05:30
Nabin Hait
427172c941 Update test_salary_structure.js 2017-09-14 17:57:21 +05:30
Nabin Hait
41146657de Set default customer group and territory after install 2017-09-14 17:26:23 +05:30
Nabin Hait
092f6d3739 Fixes ui tests 2017-09-14 16:45:47 +05:30
mbauskar
f41cff27e6 resolved merge conflicts 2017-09-14 15:32:55 +05:30
mbauskar
ea832b8157 resolved merge conflicts 2017-09-14 15:32:10 +05:30
mbauskar
fd39e6f3c8 Merge branch 'hotfix' 2017-09-14 15:28:44 +05:30
mbauskar
8ea3bb0d90 bumped to version 8.11.3 2017-09-14 15:58:44 +06:00
Nabin Hait
45dce89cae Print Settings for printing taxes with zero amount (#10782)
* Print Settings for printing taxes with zero amount

* added __init__.py file to patch module v8_9
2017-09-14 15:17:38 +05:30
Rushabh Mehta
bf8e331135 [fix] unset default customer group (#10689)
* [fix] unset default customer group

* added __init__.py file for patch v8.9 directory
2017-09-14 15:03:45 +05:30
Nabin Hait
a6d78ef842 Added Supplier Bill Date in Itemised Purchase Register (#10783) 2017-09-14 15:01:04 +05:30
Nabin Hait
beb2f3c415 Merge branch 'creamdory-sort_bom_items' into develop 2017-09-14 13:23:37 +05:30
Nabin Hait
77b225e021 Fetch BOM items in Production Order in the same order as BOM 2017-09-14 13:22:45 +05:30
Nabin Hait
3f583b6dd2 Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items 2017-09-14 12:59:31 +05:30
Vishal Dhayagude
d3e22ac09e [UI Test] Modified Sales Order UI Test (#10770)
* [UI Test] Modified Sales Order UI Test

* [fix] Codacy fixed
2017-09-14 12:51:22 +05:30
Nabin Hait
f6b132f78e Update test_quotation.js 2017-09-14 11:55:31 +05:30
Nabin Hait
c7c141a5a0 Update test_setup_wizard.py 2017-09-14 11:51:43 +05:30
rohitwaghchaure
f8458ed9e4 Merge pull request #10771 from nabinhait/pro_order_99
Update actual dates in Production Order from Timesheet
2017-09-14 10:53:48 +05:30
rohitwaghchaure
9a0db392de [Fix] Only typed keywords displying in the field on selection of customer (#10778) 2017-09-14 10:51:21 +05:30
Nabin Hait
92309afea1 Update test_setup_wizard.py 2017-09-13 22:37:14 +05:30
Prateeksha Singh
242218d2b7 Progress fixes (#10710)
* [progress] sales target slide

* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
tundebabzy
c050c6945c show error message if cannot get accounts details (#10768) 2017-09-13 15:27:30 +05:30
Vishal Dhayagude
52ac483368 [NEW] Travis Parallel Test (#10755)
* test

* test2

* test travis
2017-09-13 15:18:41 +05:30
Nabin Hait
c443c9f05d Update actual dates in Production Order from Timesheet 2017-09-13 15:14:40 +05:30
Nabin Hait
78baebfe0d Setup wizard test fix 2017-09-13 15:12:45 +05:30
Rushabh Mehta
f056974bc5 [domain] Healthcare (#10664)
* Medical module for erpnext

* Changes in core for Medical module

* patient registration updated

* fix - appointment invioce - fields missing

* pages- indicator instead of bg-color

* Lab Test field renamed service type

* Department added Lab Test

* procedure name in prescription

* fixes sample collection

* filter disabled patient

* fix patient admission

* updated patient age

* availability check msg updated

* fixes, removed procedure from invoice

* sample print renamed

* fixes, validation

* service desk physician in filter

* refactor scheduler

* Appointment -field property - set only once = 1

* Appointment - Mark closed and pending buttons removed

* Appointment - readonly = 1 if value set

* Appointment - availabilty

* Appointment - Cancel - info - cancel invoice

* Appointment - set pending appointments

* Dosage form - new DT

* Drug Prescription - Dosage form added

* Facility - Floor - removed from Fecility

* Floor - removed

* Lab Test Template - item creation validation

* Procedure - Create Procedure

* Procedure Appointment - new DT

* Service Unit - Floor reference removed

* Zone Fcilities - Unused DT removed

* Appointment Desk - fixed

* Service Desk - method pointing from procedure changed to procedure_appointment

* Consultation print - got featured

* Consultation - removed patient refernce to procedure prescription

* Procedure Prescription - removed patient refernce

* Lab Test - Changed field properties and value

* Lab Test - field property changed

* Lab Test - methods rewrite - lab test doc creation

* Lab Test - create lab test from invoice and consultaion - got changed

* Button History changed to Medical Record

* Service Desk - Updated

* Notification - Procedure Appointment

* fix-get procedure prescription

* fix field added to test prescription

* msgprint on invoice creation

* fix data on install

* Merge branch erpnext/develop

* fixes- minor

* Setup wizard - Create Sensitivity

* Appointment - Validate and Save if there is no schedule for Physician

* Consultation - Button create vital signs and medical record

* Review Type - New DocType

* Review Detail and Treatment Plan - Childs - Consultation

* Patient Medical Record - field Attach doc

* Consultation - New Fields

* Consultation - Manage new Fields - Medical record add action

* Patient Relation - Child DocType - Patient

* Patient - Patient Relation added

* Patient - collapsible = 1

* Laboratory Settings - fields - message for lab test

* Laboratory Settings - get message for lab test

* SMS text for lab test and invoice test report

* Procedure Stock Detail - Stock detail for Procedure and Template

* Template Stage Detail - Stage detail for Procedure Template

* Procedure Stage Detail - Stage detail for Procedure

* Service Unit - field - warehouse

* Scheduler - msg - content changed

* Laboratory Settings - defualt - msg content

* Invoice Test Report - msg print

* Print Format-Changed-Consultation-Invoice Test Report-Lab Test

* OP Settings - Expnse Account for Stock Entry in Procedure

* Procedure and Procedure Template - Manage Stock Stage and Sample Collection

* Procedure Appointment - Manage Stock and Stage

* Lab Test - fixed - resource not find

* Invoice Test Report - fixed - resource not find

* Procedure - doc reload after insert

* Patient Medical Record - fixed - refernce missed

* Create Vital Signs -on client side

* Rename module Medical to Healthcare

* Remove In Patient (IP) Feature.

* Rename - Procedure to Clinical Procedure

* Remove spaces in Naming Series

* Rename Duration to Drug Prescription Duration

* Duration to Drug Prescription Duration

* Merge All Settings to Healthcare Settings

* Healthcare settings - import fixed

* Procedure related documents are removed

* Appointment Desk and Sevrvice Desk are removed

* Consultation - minimal

* Consultation - minimal

* Consultation - minimal - patient detials in collapsible section

* Message Print to Alerts

* Patient - some fields removed

* Patient - create consultation - message print to alerts

* Consultation - show patient details updated

* Setup wizard - Duration to Drug Prescritpion Duration

* Healthcare Settings - patient registration - fee collection

* Lab Test - Create Sales Invoice bug fixed

* Healthcare menu rearranged

* Healthcare Settings - Optimised and Rearragnged

* Healthcare Settings - Expense account removed

* Receivable account removed from patient

* Patient - Optimised and Rearragnged

* Removed Referring Physician

* Healthcare Settings - bold headings removed

* Physician - Patient - Fields are Segregated

* Remove Service Unit

* Remove - Service Type

* Consultation invoice

* Lab Test - invoice

* Patient - Invoice

* Rename Appointment to Patient Appointment

* wip

* Patient Dashboard, Physician Form cleanup

* Dosage renamed to Prescription Dosage

* Renamed Drug Prescription Duration to Prescription Duration

* Patient Appointment booking modal

* Patient Age - calculate by dob

* Remove - scheduler

* Consultation - Appointment to Patient Appointment

* Patient Dashboard - rearranged

* Patient Appointment

* Removed rer_physician from lab test and consultation

* Patient Appontment Changes

* Appointment and Consultation - optimized

* Patient Appointment - fee validity code optimized

* Consultation and Patient Appointment - Invoice validate two side

* fix: #13 remove relation to admission

* Healthcare - Patient Portal

* fix import error

* domain Healthcare added on install

* Removed - Invoice Test Report

* Physician Schedule - menu

* Consultation - patient details - re write

* New Doctype-Medical Code

* Consultation - Daignosis codification

* Medical Code - Codification - Settings

* Medical Code Standard - Medical Code - Codification - Settings

* fix appointment calendar

* fix appointment analytics

* Menu Medical Code Standard

* New Doctype - Medical Code Standard

* Set Physician Role insted of IP Physician and OP Physician Role

* fixed some json files

* Medical code - permission to physician

* Unused Childs - Work Schedule and User List - Removed

* Label Procedure to Lab Test

* Lab Test and Patient - code optimised

* Add Item Groups - setup wizard

* Healthcare Settings - add Role - Medical Administrator

* Healthcare - Demo setup - Make Demo

* Fee Validity - Logic Test

* Test Fee Validity - Optimised

* Healthcare Doctypes - Restricted to Domain Healthcare

* Domainify - remove Healthcare Roles - Other Domains

* Healthcare doctypes - beta checked

* Codacy fixes

* Codacy - fixes

* Codacy - fixes

* Codacy - fixes

* Codacy - fixes

* Codacy - fixes

* Lab Test - print hide =1 for some fields

* Consultation - Codification field label to Medical Coding

* Codacy fixes - import frappe and etc.

* Codacy fixes - import frappe in test_vital_signs

* Codacy fixes

* Codacy fixes

* Codacy fixes and remove delete perm for patient

* send_sms - import form frappe

* Healthcare Settings

* Lab Prescription - Consultation - Test Code - read_only = 0

* Portal fixes

* Patient Appointment - filter physician - if has schedule

* Physician - IP Charge - Removed

* test - files

* Web Form - Patient Profile - removed

* Role Medical Administrator to Healthcare Administrator

* WIP healthcare documentation

* Coday - fixes

* Travis - fixes

* Lab Test Report - menu

* Reorder Healthcare settings - group lab config to bottom

* Sample Collection - New - allow Sample and patient Selection

* Rate - similar behaviour and Label as in Item Standard Selling Rate

* Healthcare documentation

* Lab Test Samples to Lab Test sample

* Commplaints to Complaint

* Commplaints to Complaint

* Antibiotics to Antibiotic

* Appointment Token Number - remove

* View - Medical record

* Codacy fixes

* update healthcare docs

* Cleanup Docs - Search, quick entry, trsck change, etc.

* [minor] ux changes
2017-09-13 12:52:30 +05:30
Nabin Hait
ff667695ad timeout in setup wizard test 2017-09-13 11:26:55 +05:30
Rushabh Mehta
f849915c13 [fix] label 2017-09-13 10:48:53 +05:30
Nabin Hait
231c324589 Merge branch 'master' into staging 2017-09-12 16:26:31 +05:30
tunde
1255aa0f11 Merge branch 'develop' into payment-terms 2017-09-12 11:54:52 +01:00
Nabin Hait
f8f29677fd Merge branch 'master' into develop 2017-09-12 16:16:57 +05:30
Nabin Hait
50312b54a0 Merge branch 'hotfix' 2017-09-12 16:16:55 +05:30
Nabin Hait
e47bd4f477 bumped to version 8.11.2 2017-09-12 16:46:55 +06:00
rohitwaghchaure
ab64e323cd Merge pull request #10747 from mbauskar/pos
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-12 16:14:28 +05:30
rohitwaghchaure
67dfd26639 [fix] Production planning tool, unable to download material required report (#10704) 2017-09-12 15:54:27 +05:30
rohitwaghchaure
54099e592e [fix] Serial No has already been received error while making purchase receipt entry for the returned serial no (#10736) 2017-09-12 15:51:52 +05:30
Manas Solanki
580f39a12c check the instructor table before querying (#10754) 2017-09-12 15:49:36 +05:30
Nabin Hait
c9e96c15af Rate and amount in a single row in tax breakup 2017-09-12 15:45:49 +05:30
Nabin Hait
de9eebe51c Fixed multiple ui tests 2017-09-12 15:40:33 +05:30
Sagar Vora
d54d6bc572 [fix] use stock_qty in reports instead of qty to match with stock_uom (#10727) 2017-09-12 11:31:10 +05:30
rohitwaghchaure
38830e54d8 [fix] No module namd student_batch_name.student_batch_name error in the patch (#10745) 2017-09-12 11:25:02 +05:30
Rohit Waghchaure
1a77922e85 rename Is Online field to Use POS in Offline Mode in pos settings 2017-09-12 11:01:48 +05:30
Makarand Bauskar
d0823adf42 [minor] translate the action name in get_slide_settings (#10740) 2017-09-12 10:52:24 +05:30
rohitwaghchaure
80b902cea6 Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings
Rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 22:36:38 +05:30
tunde
ecb118fb3b bugfix: call set_payment_schedule only in relevant doc 2017-09-11 15:45:10 +01:00
Nabin Hait
e5716e3b1e Default view of BOM is Listview 2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16 Merge pull request #10737 from nabinhait/budget_variance_for_project
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310 [Translation] Updated Translations (#10741) 2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
tunde
df3a175974 fix bugs: add payment_schedule if payment_terms_schedule specified 2017-09-11 11:02:57 +01:00
Nabin Hait
509bca36b1 Reverse charge in gst print format 2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13 Removed commit after creating custom gst fields 2017-09-11 15:00:16 +05:30
Rohit Waghchaure
4e006b0bc5 rename Is Online field to Use POS in Offline Mode in pos settings 2017-09-11 14:51:50 +05:30
Nabin Hait
f5cbb9c7b9 [fix] Actual amount for budget variance report 2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6 Merge branch 'master' into staging 2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e Merge branch 'master' into develop 2017-09-10 12:32:21 +05:30
mbauskar
b9d158076e Merge branch 'hotfix' 2017-09-10 12:32:20 +05:30
mbauskar
438088f69d bumped to version 8.11.1 2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a [hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725)
* [hotfix] dont allow guest user to list the invoices or orders

* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal

* [codecy] removed trailing whitespace

* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
tunde
96b8f223fd fix failing tests 2017-09-08 15:35:59 +01:00
Faris Ansari
197901108e Merge pull request #10713 from mbauskar/hotfix
[fix] Tax area alignment (#10690)
2017-09-08 15:59:19 +05:30
Faris Ansari
425f1df799 [fix] Tax area alignment (#10690) 2017-09-08 15:56:34 +05:30
rohitwaghchaure
225ac0dac3 [Enhance] Subscription module (#10089)
* [Enhance] Subscription module

* Added view documents from the subscription form

* Test cases

* documentation

* UI Test cases, fixes

* Removed child table in the subscription

* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow

* added patch to make subscription from the recurring data

* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller

* renamed subscription_id to subscription
2017-09-08 10:31:21 +01:00
tunde
24cb494a3b Revert "Revert "make payment_schedule field no-copy""
This reverts commit fbd895d781.
2017-09-08 10:07:39 +01:00
tunde
fbd895d781 Revert "make payment_schedule field no-copy"
This reverts commit 4f4148b0da.
2017-09-08 10:06:46 +01:00
tunde
199daf7ac5 Merge branch 'develop' into payment-terms 2017-09-08 09:59:13 +01:00
tunde
4f4148b0da make payment_schedule field no-copy 2017-09-07 18:49:10 +01:00
mbauskar
9bc2b66e14 Merge branch 'develop' into staging 2017-09-07 21:08:26 +05:30
tunde
2d3a575f29 more test cases for purchase/sales invoice 2017-09-07 14:50:20 +01:00
Nabin Hait
d4e57a38a4 Fixed multiple ui test cases 2017-09-07 19:16:38 +05:30
tunde
9085a5e52d more test cases for quotation, purchase/sales order 2017-09-07 14:31:33 +01:00
tunde
b0f6b068ef remove test based on deleted recurring_document.py 2017-09-07 13:50:46 +01:00
Rohit Waghchaure
06b22e9ac1 [Fix] Customer search optimization for the offline POS 2017-09-07 17:44:42 +05:30
tunde
ad7d3a1733 Merge branch 'develop' into payment-terms 2017-09-07 13:13:59 +01:00
rohitwaghchaure
07b713121b Merge pull request #10600 from netchampfaris/pos-refactor
POS Online
2017-09-07 17:39:45 +05:30
rohitwaghchaure
1b65575860 Merge branch 'develop' into pos-refactor 2017-09-07 17:15:58 +05:30
tunde
67f3d854bc test for quotation 2017-09-07 12:22:48 +01:00
rohitwaghchaure
166b78f022 [Enhance] Subscription module (#10089)
* [Enhance] Subscription module

* Added view documents from the subscription form

* Test cases

* documentation

* UI Test cases, fixes

* Removed child table in the subscription

* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow

* added patch to make subscription from the recurring data

* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller

* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Vishal Dhayagude
c79d14190f [fix] travis failed (#10702) 2017-09-07 16:05:41 +05:30
tunde
353099d7ad Merge branch 'develop' into payment-terms 2017-09-07 11:31:26 +01:00
tunde
788de8001c more tests 2017-09-07 11:30:06 +01:00
tunde
32aa7c1e68 Automatically set payment schedule if not specified
- fix failing test cases
- fix failing tests for recurring documents
- others
2017-09-07 06:52:15 +01:00
tunde
dba6f841e6 refactor: DRY for due date disabled 2017-09-07 06:51:07 +01:00
Rushabh Mehta
2e8e5354e9 [fix] trainig_feedback.py 2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633 [rename] /test_training_event_attendance.js 2017-09-07 09:07:15 +05:30
Rushabh Mehta
134d59949a [minor] update warehouse_group in item.reorder_levels 2017-09-07 09:04:24 +05:30
Prateeksha Singh
2697e332f3 [fix] wizard UI test order (#10663)
* [fix] wizard ui test order

* [setup] remove old test

* [fix] commit to remove lock from defaults table during setup
2017-09-07 09:03:16 +05:30
tunde
e7da1c5500 refactor: DRY for disable due date logic 2017-09-06 12:36:45 +01:00
Rohit Waghchaure
c72d08e8b9 Added indicator to show stock is available or not 2017-09-06 14:56:08 +05:30
tunde
9e32387aa7 fix customer test records 2017-09-06 09:44:45 +01:00
tunde
794001df50 more test cases in Supplier 2017-09-06 09:16:11 +01:00
tunde
98fd5401ff test customer 2017-09-06 08:47:14 +01:00
rohitwaghchaure
ec46e51ed4 Merge pull request #10426 from nabinhait/payment_entry_deductions
Unallocated and difference amount calculation in Payment Entry
2017-09-06 13:04:25 +05:30
Rohit Waghchaure
7419c4b577 Fixed test cases 2017-09-06 12:44:51 +05:30
rohitwaghchaure
914fd197fc Update test_payment_against_invoice.js 2017-09-06 12:42:58 +05:30
Faris Ansari
8868ae22be [fix] Tax area alignment (#10690) 2017-09-06 12:17:12 +05:30
Nabin Hait
ded8d11728 Js tests added for write off difference amount 2017-09-06 12:11:48 +05:30
Nabin Hait
6c3618be37 Unallocated and difference amount calculation in Payment Entry 2017-09-06 12:10:52 +05:30
Rushabh Mehta
6ef741554c [fix] [patch] rename_company_sales_target_field.py 2017-09-06 10:53:26 +05:30
tunde
98cca8ee18 remove unused imports 2017-09-06 06:11:58 +01:00
tunde
8173239f63 Merge branch 'develop' into payment-terms 2017-09-06 04:18:40 +01:00
tunde
e5973e45f1 fix test 2017-09-05 18:11:58 +01:00
tunde
e0cec4ef05 Merge branch 'payment-terms' of https://github.com/tundebabzy/erpnext into payment-terms 2017-09-05 17:37:35 +01:00
tunde
a496c43581 fix test 2017-09-05 17:36:21 +01:00
mbauskar
668d04548a Merge branch 'master' into develop 2017-09-05 20:45:00 +05:30
mbauskar
68a4146999 Merge branch 'staging' 2017-09-05 20:44:59 +05:30
mbauskar
d4316f0264 bumped to version 8.11.0 2017-09-05 21:14:58 +06:00
Faris Ansari
4bcaeb312c fix codacy 2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200 Merge branch 'develop' into pos-refactor 2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e Namespace PointOfSale class 2017-09-05 17:10:24 +05:30
Nabin Hait
799619b6b0 Fixed multiple uom in selling 2017-09-05 15:52:12 +05:30
tundebabzy
dc64f70f07 Merge branch 'develop' into payment-terms 2017-09-05 11:14:47 +01:00
Makarand Bauskar
3ad045302b [minor] set abbreviation on company name trigger (#10671)
* [minor] set abbreviation on company name trigger

* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc Test case fixed for multi-currency and multi-uom BOM (#10679) 2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97 Company Dashboard Title Translatable (#10673) 2017-09-05 15:09:35 +05:30
creamdory
05885ca184 Sorting in Production Order BOM Items 2017-09-05 17:02:54 +08:00
Rohit Waghchaure
2967d7ed01 Merge branch 'bom_currency' into develop 2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76 update rate based on uom conversion factor 2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf [Translation] Updated Translations (#10669) 2017-09-05 09:19:06 +05:30
tunde
7f9a462506 Merge branch 'develop' into payment-terms 2017-09-05 01:35:51 +01:00
tunde
743ba690dd more test cases for Supplier 2017-09-05 01:17:14 +01:00
tunde
ed86efb1fd modify get_due_date to check Supplier Type if needed 2017-09-05 01:15:31 +01:00
tunde
b8ddae13ba fix patches 2017-09-05 00:23:24 +01:00
tunde
2fdb857fed fix due date disable bug 2017-09-05 00:21:54 +01:00
tunde
60aecd87b1 fix bugs in patches 2017-09-04 19:40:31 +01:00
tunde
4e4a40e46b add new field payment_terms to Supplier Type 2017-09-04 19:38:41 +01:00
tunde
635423d70f rewrite Supplier test cases 2017-09-04 19:37:54 +01:00
tunde
57171cdc48 patch for credit days in Supplier Type 2017-09-04 19:33:35 +01:00
tunde
95b3d7c619 patch for payment term field in Supplier Type 2017-09-04 19:32:14 +01:00
tunde
4163c9529d fix get_due_date function to return date as string 2017-09-04 19:30:01 +01:00
Nabin Hait
22cff25bf5 BOM rates as per selected currency and UOM 2017-09-04 18:31:45 +05:30
tunde
c6d60e1de3 update patch list 2017-09-04 13:41:17 +01:00
tunde
bc9b5d699e fix patch 2017-09-04 13:40:54 +01:00
tunde
76bba08e45 patch to create and set default payment term in customer/supplier 2017-09-04 13:37:32 +01:00
tunde
feffca2b05 patch to add payment_terms_field 2017-09-04 13:34:31 +01:00
mbauskar
7faac85fff Merge branch 'master' into staging 2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec Merge branch 'master' into develop 2017-09-04 14:50:31 +05:30
mbauskar
10fdf5a8c3 Merge branch 'hotfix' 2017-09-04 14:50:30 +05:30
mbauskar
11cf44986b bumped to version 8.10.2 2017-09-04 15:20:30 +06:00
Prateeksha Singh
95d8fd38f5 User Progress (#10336)
* [user-progress] first cut

* [user-progress] Add users slide, remove taxes, make sample data

* wip tests

* [setup-wiz] UI test

* [user-progress] notif test, docs trim

* wip

* [user-progress] Setup Progress single to update action states, fixtures

* setup progress actions patch

* rename sales_target field patch

* [progress] wip reform slide data

* [progress] remove slide data

* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Makarand Bauskar
cf9e986f82 [hotfix] fixed the invalid variable name lead.name (#10648) 2017-09-04 10:25:37 +05:30
rohitwaghchaure
fd39d6bd3c [Enahance] Provision to select customer, item code while making an invoice from timesheet (#10616) 2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928 Help pages for Attendance (#10634)
* Help pages for Schools setup

* Documentation of Schools module

* Help pages for Student

* Help pages for Student

* Help pages for Schools Student and Admission Module

* Documentation for Schools Attendance
2017-09-04 10:17:18 +05:30
Saurabh
21833413b0 [fix] ERPNext signup link fix on demo page (#10649) 2017-09-04 10:15:24 +05:30
Francisco Roldán
11355cd3c9 Set at lost translated in quotation (#10652) 2017-09-04 10:14:58 +05:30
Nabin Hait
2b05e61d58 Merge branch 'rmehta-bcornwellmott-confirm_training' into develop 2017-09-04 10:13:47 +05:30
Nabin Hait
baacf51a00 Fixed merge conflict 2017-09-04 10:13:29 +05:30
Zarrar
85eeafdccc added filter for grading scale selection (#10639) 2017-09-01 21:45:10 +05:30
Makarand Bauskar
d6922b2de3 [hotfix] lead name should available before creating new customer from quotations (#10642) 2017-09-01 18:45:40 +05:30
Rohit Waghchaure
6ab630371d Fixed serial no trigger not working from dialog box 2017-09-01 17:02:42 +05:30
tunde
975eff7310 remove redundant test case 2017-09-01 12:10:44 +01:00
Umair Sayed
f1881065a8 Merging Help Articles (Q & A) into Manual (Part 2) (#10629)
* adding articles in the manual

* adding articles in the manual 2

* migrating help articles to manuals

* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
tunde
cbd72f6113 adjust failing tests 2017-09-01 11:48:00 +01:00
tunde
7b7dcddf86 modify get_due_date call from sales/purchase invoice 2017-09-01 11:36:08 +01:00
tunde
b3a6338c79 patch replace credit_days with payment terms schedule 2017-09-01 11:35:22 +01:00
tunde
f0e9dd2597 patch to add due_date to GL Entry table 2017-09-01 11:34:26 +01:00
Rushabh Mehta
fc1c00716c [test] test_account.js - more timeout? 2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00 [test] test_account.js 2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6 [test] test_account.js 2017-09-01 11:46:11 +05:30
tunde
1c2edaebc4 patch customer records
- creates payment term and payment term template based on credit_days setting
- sets payment term template for records that had credit_days
2017-08-31 22:52:06 +01:00
tunde
8935f6546c removes get_credit_days function as it is no longer useful 2017-08-31 16:31:15 +01:00
tunde
3b4bd3791d adjust get_due_date to calculate based on payment term template 2017-08-31 16:28:47 +01:00
tunde
e44ce5d88e adjustment: removes credit_days_based on and credit_days fields 2017-08-31 16:11:42 +01:00
tunde
657ecd5227 adjustment: removes credit_based_on field 2017-08-31 16:06:56 +01:00
Nabin Hait
a9c9b69c22 Change actual charges based on exchange rate (#10619)
* Change actual charges based on exchange rate

* Update transaction.js
2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244 [Translation] Updated Translations (#10628) 2017-08-31 19:38:41 +05:30
tunde
229b583715 disable due date field if form has payment schedule data 2017-08-31 14:30:53 +01:00
Rohit Waghchaure
3e43927767 Test cases 2017-08-31 18:21:27 +05:30
tunde
50ec45d3b6 Merge branch 'develop' into payment-terms 2017-08-31 13:46:02 +01:00
tunde
400d046653 set payment terms template in get_party_details 2017-08-31 13:44:57 +01:00
Saurabh
60739847ab [minor][fix] change price field type from float to currency (#10626) 2017-08-31 17:08:30 +05:30
tunde
762c810fa2 add payment terms to supplier master 2017-08-31 11:52:49 +01:00
tunde
2775175b17 add payment terms to customer master 2017-08-31 11:52:14 +01:00
mbauskar
9012a9b414 Merge branch 'master' into staging 2017-08-31 15:31:48 +05:30
mbauskar
4f939b82b6 Merge branch 'hotfix' 2017-08-31 15:31:47 +05:30
mbauskar
2965f92be3 Merge branch 'master' into develop 2017-08-31 15:31:47 +05:30
mbauskar
2a4328b4f5 bumped to version 8.10.1 2017-08-31 16:01:47 +06:00
mbauskar
d974bcd2fa Merge branch 'develop' into staging 2017-08-31 15:30:12 +05:30
Nabin Hait
d7ff9dca1d Fixed rounding issue in Process Payroll, fixes #9300 (#10586) 2017-08-31 15:17:01 +05:30
Nabin Hait
e7e29b7f10 GST print format for POS (#10590)
* Serial no added in GST tax invoice

* GST print format for POS
2017-08-31 15:06:12 +05:30
Umair Sayed
84be137b4e Migrating Help Articles (Q&A format) into User Manual (#10608)
* adding articles in the manual

* adding articles in the manual 2

* migrating help articles to manuals
2017-08-31 14:53:47 +05:30
Vishal Dhayagude
1252c30edf [UI Test] UI test for Repack and Sales Invoice with Serialize item Added (#10583)
* [UI Test] UI test for Repack and Sales Invoice with Serialize item Added

* [Fix] Fixed path for sales invoice"
2017-08-31 14:47:56 +05:30
Vishal Dhayagude
1458d7fea6 [UI Test] Stock Entry for material issue with serialize item (#10592) 2017-08-31 14:47:01 +05:30
tundebabzy
7f8a259beb Fixer Always Fetches Latest Exchange Rate Even When Date is Specified (#10596) (#10597)
* test that confirms the bug. Same test should pass after fix

* make use of correct api url
2017-08-31 14:30:15 +05:30
rohitwaghchaure
56e31d05e9 [Fix] POS customer field is hang while searching customer, make error log if sync has failed (#10607) 2017-08-31 14:19:58 +05:30
krnkris
3c635e219e Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json (#10601) 2017-08-31 14:17:46 +05:30
tunde
3dfbd957b7 add payment terms to supplier master 2017-08-31 09:42:01 +01:00
tunde
226164d81c add payment terms in customer master 2017-08-31 09:41:25 +01:00
Makarand Bauskar
de278635a3 [hotfix] fixes for UnicodeDecodeError (#10620) 2017-08-31 13:36:56 +05:30
tunde
e5460ab1df rename patch 2017-08-30 22:37:14 +01:00
tunde
6de18ce589 codacy fixes 2017-08-30 21:20:41 +01:00
tunde
93c015a42b add due_date in GL Entry from Journal Entry 2017-08-30 21:05:38 +01:00
tunde
501ef8733b fix due_date autopopulate commit 2017-08-30 21:02:20 +01:00
Rohit Waghchaure
7e752c4ebf Added patch, fixed codacy issue 2017-08-31 00:31:35 +05:30
tunde
4e490ad718 Merge branch 'develop' into payment-terms 2017-08-30 14:11:40 +01:00
tunde
08d8ca0184 enhance reference_due_date behaviour:
- creates new api - get_invoice_due_dates
- when reference_name is changed, populate reference_due_date
2017-08-30 13:55:32 +01:00
tunde
2883662ccb change due_date to reference_due_date in Journal Entry Account 2017-08-30 08:45:28 +01:00
Faris Ansari
6163a397df Disable eslint in lib 2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee Grand Total Value width 2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198 Merge branch 'develop' into pos-refactor 2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec Merge branch 'master' into hotfix 2017-08-29 20:42:06 +05:30
mbauskar
a896e52489 resolved merge conflicts 2017-08-29 20:41:59 +05:30
mbauskar
fd6b371dac Merge branch 'staging' 2017-08-29 20:38:21 +05:30
mbauskar
c0f34f454b bumped to version 8.10.0 2017-08-29 21:08:21 +06:00
tunde
a19ea6e2f3 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms 2017-08-29 15:26:50 +01:00
Rohit Waghchaure
70aaff46be minor fix in item group search 2017-08-29 19:19:58 +05:30
tundebabzy
1a947dbf6a Item Name not loaded in Material Request via BOM (#10535) (#10555)
* adds item_name to child table

* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table

* removes empty first row after getting from BOM

* ui test
2017-08-29 18:18:27 +05:30
tunde
7555a4a13e fix patch and also patch payment entries 2017-08-29 13:40:16 +01:00
Faris Ansari
c70bbacd34 Add online, offline option, fix search 2017-08-29 15:27:17 +05:30
tunde
3b327ed55f 'modify patch to also adjust journal entries' 2017-08-29 10:23:19 +01:00
Faris Ansari
655f86d5e2 UI fixes 2017-08-29 14:27:01 +05:30
Faris Ansari
b9939a6449 Merge pull request #10448 from joelios/selfpostback
improvement for self-postbacks
2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2 handle both cases 2017-08-29 14:02:49 +05:30
Rohit Waghchaure
ba3f0e6b70 Added serial no, batch no, item group functionality 2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1 Python 3 compatibility syntax error fixes (#10519)
* Use Python 3 style print function

* Use 'Exception as e' instead of 'Exception, e'

* Unpack tuple arguments explicitly in instead of relying on auto unpacking

* Use consistent indentation

* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Faris Ansari
847f9f80c1 Merge pull request #10559 from mntechnique/pos_scanner_hotfix
[Fix] POS Scanner
2017-08-28 16:54:01 +05:30
Vishal Dhayagude
7ed4bfe7ee [UI Test] UI Test for Material Receipt with Serialize Item Added (#10565)
* [UI Test] UI Test for Material Receipt with Serialize Item Added

* [fix]Codacy fixed
2017-08-28 16:53:25 +05:30
Faris Ansari
8fbc08f91f Decrease timeout to 400 2017-08-28 16:52:20 +05:30
Vishal Dhayagude
872bebbbf8 [UI Test] Stock Entry for Subcontract (#10574) 2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996 [UI Test] Stock Entry for Material Transfer to Manufacture (#10572) 2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab resolved merged conflicts 2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2 resolved merged conflicts 2017-08-28 11:57:56 +05:30
mbauskar
95e13ea629 Merge branch 'hotfix' 2017-08-28 11:56:17 +05:30
mbauskar
d44af40de8 bumped to version 8.9.2 2017-08-28 12:26:17 +06:00
Nabin Hait
2df0788c11 Validate for negative outstanding reference only if party is Customer or Supplier (#10568) 2017-08-28 11:23:33 +05:30
Vishal Dhayagude
914b8463b7 [UI Test] UI Test for Payment Request Added: (#10553) 2017-08-28 11:14:28 +05:30
Utkarsh Goswami
7ba2a83182 Tests for Loan (#10557) 2017-08-28 11:13:16 +05:30
Vishal Dhayagude
554cf9be44 [UI Test] UI Test Added for Bank Reconciliation (#10563) 2017-08-28 11:11:36 +05:30
Vishal Dhayagude
da2164373c [UI Test] UI Test added for Batch (#10564) 2017-08-28 11:10:26 +05:30
Vishal Dhayagude
c3a2204653 [UI Test] UI Test for Sales Order Cancel, amend and save (#10570) 2017-08-28 11:09:35 +05:30
tunde
63c8cb2fd1 add due_date to Journal Entry Account doctype 2017-08-27 17:56:47 +01:00
Faris Ansari
3ae9e91bcd Add memoization in search 2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0 Styling and code fixes 2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe Added email, edit on form view from POS, pay using numpad functionality 2017-08-27 08:54:40 +05:30
Revant Nandgaonkar
2558daf6b7 Allow search without keypress enter 2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0 [Fix] POS Scanner
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
tunde
6b2d9e4990 patch to add due date to GL Entries for Sales/Purchase invoice 2017-08-25 15:25:18 +01:00
Zarrar
7dc113e977 instructor-naming (#10550) 2017-08-25 17:48:36 +05:30
Utkarsh Goswami
579c8e68f9 Tests for Expense Claims [HR] (#10514) 2017-08-25 16:12:49 +05:30
Ashwini Save
e33a1e0515 Hide "Help Article" button for timeline Communication type "Comment". (#10541) 2017-08-25 12:44:33 +05:30
Nabin Hait
bf4a974124 IMproved print format for AR/AP report (#10528) 2017-08-25 12:10:49 +05:30
Utkarsh Goswami
9a04da27b0 Test for training (#10545) 2017-08-25 12:01:04 +05:30
AravindPranera
764bb30d2d Fetching Opportunity items into Request for Quotation 2017-08-24 18:34:45 +05:30
AravindPranera
6544a85f1e Opportunity Items fetching into Request for quotation 2017-08-24 18:32:40 +05:30
Manas Solanki
8de7c0245c Fixes in the naming series (#10480)
* rewrite the js

* fix the space issue in the naming series
2017-08-24 17:51:23 +05:30
Vishal Dhayagude
17b2720f5b [UI Test] UI Test for Payment Entry (#10521) 2017-08-24 17:50:28 +05:30
Faris Ansari
5d9196960e new form improvements 2017-08-24 17:09:34 +05:30
Nabin Hait
caab582943 Tax breakup for actual amount and fixes in itemised purchase register (#10515)
* Tax breakup for actual amount and fixes in itemised pur register

* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
Zarrar
1010a2a2a4 Resolving some issues in school [ issue no:- #10464 ] (#10529)
* guardian_name issue fix

* guardian table issue resolved

* resolved fetching issue + unnecessary code removed
2017-08-24 16:22:06 +05:30
Utkarsh Goswami
3da5574d79 Test for appraisal (#10525) 2017-08-24 15:48:57 +05:30
Rushabh Mehta
6b651d734e [fix] status in purchase_receipt.py (#10534) 2017-08-24 15:47:49 +05:30
Rohit Waghchaure
e5f6b4d640 Added print, make new invoice from POS functionality 2017-08-24 15:27:55 +05:30
Rushabh Mehta
7e506af0b9 [fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538) 2017-08-24 15:23:33 +05:30
tunde
f7e87e66ee do correct gl entry for debit and credit notes 2017-08-23 22:36:25 +01:00
Rushabh Mehta
72fa958f2c [layout] lead and opportunity (#10487) 2017-08-23 18:47:57 +05:30
Vishal Dhayagude
641d88fd6b [UI Test] UI Test added for Journal Entry (#10512)
* [UI Test] UI Test added for Journal Entry

* [mod] Edited date in journal Entry

* [fix] Codacy fixed
2017-08-23 18:32:12 +05:30
Faris Ansari
6d2f6c2e4d Search improved, code refactor 2017-08-23 16:25:16 +05:30
Rushabh Mehta
4a546e6c18 [minor] delivery note standard filter 2017-08-23 16:16:43 +05:30
mbauskar
dc9744f353 Merge branch 'develop' into staging 2017-08-23 13:19:48 +05:30
Makarand Bauskar
dd8c0febd5 [minor] changed the modified date for bom for rename_bom_update_tool patch (#10509) 2017-08-23 13:17:37 +05:30
Faris Ansari
26df5b8c00 Connect Numpad events with POSCart 2017-08-23 13:12:12 +05:30
mbauskar
2d2b12c800 Merge branch 'hotfix' 2017-08-23 13:06:43 +05:30
mbauskar
06f5ae0e78 Merge branch 'master' into develop 2017-08-23 13:06:43 +05:30
mbauskar
918f029d98 bumped to version 8.9.1 2017-08-23 13:36:43 +06:00
Nabin Hait
cb40bd86f8 Supplier bill no in GST itemised purchase register (#10513) 2017-08-23 13:04:50 +05:30
Rohit Waghchaure
b73321c577 Item search refactor 2017-08-23 12:15:10 +05:30
Saurabh
b903c86076 Merge pull request #10506 from nabinhait/hotfix677
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902 Minor fix in itemised sales register 2017-08-23 09:44:33 +05:30
mbauskar
1669404f06 Merge branch 'staging' 2017-08-22 20:22:24 +05:30
mbauskar
b69ec059fe Merge branch 'master' into develop 2017-08-22 20:22:24 +05:30
mbauskar
d46a9572af bumped to version 8.9.0 2017-08-22 20:52:24 +06:00
rohitwaghchaure
7379e4e5de Merge pull request #10195 from nabinhait/auto_update_bom_cost
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 19:14:53 +05:30
Nabin Hait
bb326f2bbd Chart of accounts for Taiwan (#10435) 2017-08-22 19:07:42 +05:30
Nabin Hait
34c218b2de Minor improvements based on skip_transfer (#10457) 2017-08-22 19:07:16 +05:30
Nabin Hait
382f5eb1b1 Run sales/purchase register for one month by default (#10493) 2017-08-22 19:06:21 +05:30
tunde
d13fe18d30 Merge branch 'develop' into payment-terms 2017-08-22 14:18:11 +01:00
Doridel Cahanap
a6a93cbe06 [Fix] Request for Quotation Portal Title (#10489) 2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343 [UI Test] UI test for Sales Invoice with Payment Entry (#10483)
* [UI Test] UI test for Sales Invoice with Payment Entry

* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593 Travis fix for purchase order receipt (#10498) 2017-08-22 17:39:06 +05:30
mbauskar
081ff80882 Merge branch 'hotfix' 2017-08-22 15:42:10 +05:30
mbauskar
4396a0e9a8 Merge branch 'master' into staging 2017-08-22 15:42:10 +05:30
mbauskar
3b3ab4d574 Merge branch 'master' into develop 2017-08-22 15:42:10 +05:30
mbauskar
974cfd2895 bumped to version 8.8.6 2017-08-22 16:12:09 +06:00
rohitwaghchaure
187cea3602 [Fix] Accepting duplicate serial no is purchase receipt (#10469)
* [Fix] Accepting duplicate serial no is purchase receipt

* Fixed test cases
2017-08-22 15:38:32 +05:30
Nabin Hait
28d8557905 [fix] Taxes in itemised purchase register (#10494) 2017-08-22 15:30:45 +05:30
mbauskar
8f4e1712ba Merge branch 'hotfix' 2017-08-22 12:03:47 +05:30
mbauskar
7716a08b5d Merge branch 'master' into staging 2017-08-22 12:03:47 +05:30
mbauskar
7d9452f4e4 Merge branch 'master' into develop 2017-08-22 12:03:47 +05:30
mbauskar
4cbd43cb40 bumped to version 8.8.5 2017-08-22 12:33:46 +06:00
Makarand Bauskar
11224eaf06 [hotfix] fixes for TypeError: 'NoneType' object is not iterable (#10484) 2017-08-22 12:03:02 +05:30
rohitwaghchaure
02bad86037 Merge pull request #10473 from rohitwaghchaure/item_group_issue_in_pos
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-22 11:34:49 +05:30
Nabin Hait
6c6e45157b Fixed test case for replace bom 2017-08-22 10:49:58 +05:30
Nabin Hait
52cc08dd2d Test case added for replacing BOM 2017-08-22 10:49:57 +05:30
Nabin Hait
adbf8adfb9 Update BOM cost in all BOMs based on latest rm rate 2017-08-22 10:49:57 +05:30
tunde
10fc880b06 Merge branch 'develop' into payment-terms 2017-08-21 18:27:46 +01:00
Makarand Bauskar
a591d1df5f [minor] ingore user permission for old_parent fields (#10471) 2017-08-21 19:04:49 +05:30
Rohit Waghchaure
33326fe90e [Fix] Pricing rule applying only on item groups defined in POS profile 2017-08-21 16:30:21 +05:30
Faris Ansari
78c81d9c6c Refactor payment code 2017-08-21 15:05:33 +05:30
Ameya Shenoy
c87c1dbbbf converted production tests to INR from USD (#10472) 2017-08-21 14:10:04 +05:30
Rushabh Mehta
575ab3ab70 [docs] for print style (#10452) 2017-08-21 12:24:28 +05:30
mbauskar
5088ad11ee Merge branch 'master' into staging 2017-08-21 08:58:52 +05:30
mbauskar
62f0722325 resolved merge conflicts 2017-08-21 08:58:42 +05:30
mbauskar
9d6900bd3b Merge branch 'hotfix' 2017-08-21 08:57:32 +05:30
mbauskar
ddb26d02e5 bumped to version 8.8.4 2017-08-21 09:27:32 +06:00
Nabin Hait
879e162cce Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405) 2017-08-21 08:28:55 +05:30
Zarrar
196b491ac4 [ui test ] Travis failing fix (#10468)
* Value in assertion was wrong

* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
Nabin Hait
1f49f511aa Tax rate in Itemised sales/purchase register and cleanups (#10439) 2017-08-21 08:05:12 +05:30
rohitwaghchaure
0d9ab86496 [Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa (#10453) 2017-08-21 07:52:49 +05:30
rohitwaghchaure
6b1624cfee [Fix] Tax rule is not working for the parent customer groups (#10458) 2017-08-21 07:38:37 +05:30
Makarand Bauskar
222e86bb13 [hotfix] fixed the mysql syntax error issue on stock ledger report (#10442) 2017-08-21 07:35:16 +05:30
Makarand Bauskar
80d06da978 [hotfix] fixed mysql syntax error in Student and Guardian Contact Details report (#10450) 2017-08-21 07:34:45 +05:30
tunde
fb144303f5 codacy and typo fixes 2017-08-20 17:23:55 +01:00
tunde
c7f46218d7 tests and test fixes
fixes test case:
make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month'
so that it doesn't conflict with payment term due date

fix test case:
create purchase invoice with new supplier with credit_days_based_on
"Fixed Days" as the default "Last Day of Month" does not apply when
using payment terms
2017-08-20 17:23:27 +01:00
tunde
be1b871c53 modify validation if doc has payment term schedule 2017-08-20 17:22:59 +01:00
tunde
4c5efa3dec renames set_payment_schedule and removes it from validation 2017-08-20 17:22:06 +01:00
tunde
43870aa8db moves set_payment_schedule and validate_payment_schedule to accounts_controller 2017-08-20 16:56:43 +01:00
tunde
20c041cea4 add Payment Term to Purchase Invoice 2017-08-20 16:52:05 +01:00
tunde
b76ab49ede add Payment Term to Purchase Order 2017-08-20 16:52:05 +01:00
tunde
9df5e004cf add Payment Terms to Sales Order 2017-08-20 16:52:05 +01:00
tunde
bc174d980c add Payment Term to Quotation 2017-08-20 16:52:05 +01:00
Nabin Hait
9275969b51 Payment Terms: doctypes, schedule, payments and more
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months

fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
2017-08-20 16:51:29 +01:00
KanchanChauhan
dd351c585a [Minor] Title added to rfq web view (#10454) 2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0 [UI Test] travis.yml modified for fresh UI Test (#10446)
* [UI Test] travis.yml modified for fresh UI Test

* [fix] travis

* Update test_production_order.js

* Update test_production_order.js

* Update test_purchase_order_receipt.js

* Update tests.txt

* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Faris Ansari
eba50c6860 Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor 2017-08-18 17:00:02 +05:30
Vishal Dhayagude
592e8c2e77 [UI Test] UI Test added for Stock Reconciliation (#10432)
* [UI Test] UI Test added for Stock Reconciliation

* [fix] Codacy
2017-08-18 15:01:20 +05:30
Utkarsh Goswami
5a27aead06 Test for Process Payroll (#10447) 2017-08-18 13:12:53 +05:30
Rohit Waghchaure
f03a73466c Added modal for multi mode payment, provision to add write off and change amount 2017-08-18 12:15:19 +05:30
Utkarsh Goswami
ca63cc6439 [UI Test Recruitment] To test Recruitment in HR module (#10441)
* Tests for Recruitment

* Codacy fix
2017-08-18 11:57:01 +05:30
Vishal Dhayagude
2890fa74a2 [UI Test] UI Test for Purchase Receipt Added (#10434) 2017-08-18 11:55:14 +05:30
Joel Mesmer
97c1bcf14f improvement for self-postbacks 2017-08-17 22:20:18 +02:00
Zarrar
780f11ec16 path to test updated (#10438) 2017-08-17 18:36:33 +05:30
Makarand Bauskar
fe43ecb5ee [hotfix] fixed type in gst_state_code_data.json file (#10437) 2017-08-17 17:34:25 +05:30
rohitwaghchaure
fff56530c4 [Fix] Due date not fetching on the payment entry against the invoices (#10419) 2017-08-17 14:47:25 +05:30
Nabin Hait
5b266eff89 Update patches.txt 2017-08-17 14:42:50 +05:30
Faris Ansari
0f3d431476 Update cart ui from cur_frm, Add number pad 2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284 Added functional part 2017-08-17 12:56:14 +05:30
Faris Ansari
7bcb1cfc42 more styling 2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945 Styling for search fields 2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7 Add clusterize, move customer field to POSCart, get POS profile 2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2 [wip] New POS UI 2017-08-17 12:56:14 +05:30
Makarand Bauskar
446c2b0e91 [hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays (#10355) 2017-08-17 12:39:35 +05:30
Nabin Hait
0650d8e155 Merge branch 'bcornwellmott-no_quote' into develop 2017-08-17 12:03:01 +05:30
Ben Cornwell-Mott
ee9f9863ff MORE CODACY 2017-08-17 11:29:11 +05:30
Ben Cornwell-Mott
9727a3fe50 More codacy issues 2017-08-17 11:27:31 +05:30
Rohit Waghchaure
df83191ea0 Set write permission to sales manger for permlevel 1 in Quotation doctype 2017-08-17 11:27:30 +05:30
Ben Cornwell-Mott
13218f7d76 Fixed codacy issues 2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
bea7d9f919 Added tests 2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
1b43515160 Codacy fixes 2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
48058a88e5 Minor cleanup 2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
f7e42211b9 Added Quote Status to RFQ Suppliers with No Quote 2017-08-17 11:18:49 +05:30
Zarrar
abd3419632 made test less dependent on python test data (#10424) 2017-08-17 11:04:16 +05:30
Shreya Shah
b5ed6823d6 [UI Test] Buying - Create Purchase receipt (#10421)
* Create purchase receipt after submitting the purchase order

* Checks quantity and rate in stock ledger
2017-08-17 11:03:43 +05:30
Vishal Dhayagude
f37eacdee5 [UI Test] Purchase Invoice (#10422)
* [UI Test] Purchase Invoice

* [fix] Travis failed
2017-08-17 11:01:59 +05:30
Nabin Hait
64c32dcd59 [fix] Update monthly sales value on Company (#10417)
* [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp

* Company monthly sales: patches and test cases
2017-08-16 15:04:18 +05:30
Zarrar
9eb8680ec9 travis failing issue fix (#10420) 2017-08-16 13:25:31 +05:30
tundebabzy
f35710db15 remove empty first row if needed (#10378)
refactor code: move global functions to callback scope
2017-08-16 13:25:18 +05:30
tundebabzy
258faab761 Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency (#10409) (#10410)
* properly keep track of document currency and company currency

* Update taxes_and_totals.js
2017-08-16 13:16:46 +05:30
tundebabzy
5fc5b68a49 update multi currency accounting documentation to remove incorrect info (#10404) 2017-08-16 11:41:56 +05:30
Manas Solanki
0371d5a326 new item group filter in the stock ledger report (#10400) 2017-08-16 11:35:04 +05:30
Utkarsh Goswami
44b088c6b3 [UI Test Salary] To test the salary structure and the salary slip (#10407)
* Test for salary structure and salary slip

* Test for salary structure and salary slip

* Test for salary structure and salary slip

* Travis CI fixes

* Updated

* Updated

* travis fixes

* Travis fixes
2017-08-16 11:32:04 +05:30
Shreya Shah
289400d944 [UI Test] Buying module - Multiple tests for Purchase orders (#10414)
* Extended timeout to avoid rare failures

* Get purchase orders with discount on grand total

* Get purchase orders with discount on individual items

* Get purchase orders and calculate taxes

* Added paths
2017-08-16 11:31:34 +05:30
Faris Ansari
21fc26c2a2 Update cart ui from cur_frm, Add number pad 2017-08-14 18:25:59 +05:30
Shreya Shah
f6544e95d4 [UI Tests] Buying Module - Supplier quotations and Purchase orders (#10397)
* Get Supplier Quotation with item wise discount

* Get purchase orders

* Added paths

* Codacy fix
2017-08-14 17:29:09 +05:30
Rushabh Mehta
4f366e9c38 [fix] conflicts 2017-08-14 16:15:20 +05:30
Rushabh Mehta
683b015951 [fix] email alert 2017-08-14 15:03:33 +05:30
Makarand Bauskar
0973161ae5 [docs] Translate the Schools Assessment section documentation to Spanish (#10398)
* [docs] Translate the Schools app documentation to Spanish

* [docs] Translate the Schools Student section documentation to Spanish

* [docs] Translate the Schools SETUP section documentation to Spanish

* [docs] Translate the Schools ADMISSION section documentation to Spanish

* [docs] Translate the Schools FEES section documentation to Spanish

* [docs] Translate the Schools SCHEDULE section documentation to Spanish

* [docs] Translate the Schools Assessment section documentation to Spanish
2017-08-14 14:55:48 +05:30
mbauskar
40377e87de Merge branch 'master' into staging 2017-08-14 12:33:56 +05:30
mbauskar
7b7a77a551 Merge branch 'hotfix' 2017-08-14 12:33:55 +05:30
mbauskar
4ca3e8f70a Merge branch 'master' into develop 2017-08-14 12:33:55 +05:30
mbauskar
e0cc7c64a1 bumped to version 8.8.3 2017-08-14 13:03:55 +06:00
Makarand Bauskar
e5ae4d3bd3 send email via the background jobs (#10374) (#10393)
* send the email via the background worker in the payment request (#10350)

* send email via the background jobs (#10374)
2017-08-14 12:22:50 +05:30
Vishal Dhayagude
7186131d65 [UI Test] sales invoice (#10394)
* [UI Test] Sales Invoice

* [UI Test] Sales Invoice
2017-08-14 12:22:04 +05:30
Rushabh Mehta
1132502e14 [fix] test 2017-08-14 12:09:30 +05:30
Rushabh Mehta
ea573e2421 [training] update names 2017-08-14 11:53:34 +05:30
Rushabh Mehta
1fe1a47658 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
6cb14cfc04 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
89505522d3 [docs] update docs 2017-08-14 11:53:34 +05:30
Rushabh Mehta
550b0fab84 [fixes] email notifications by email alert on training event and result 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
35a4e587ee Fixes for camel_case and translations 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e92b4737e3 codacy fixes 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
94c6b7409b Updated documentation 2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e9dbafcc10 Improve email format for training event, add ui test 2017-08-14 11:53:34 +05:30
Rohit Waghchaure
854d335ab1 Added functional part 2017-08-14 11:34:42 +05:30
Manas Solanki
a5cb9ae8bd send email via the background jobs (#10374) 2017-08-14 09:50:15 +05:30
mbauskar
f03afe0878 Merge branch 'master' into staging 2017-08-14 09:31:01 +05:30
mbauskar
2fa8af3b02 Merge branch 'master' into develop 2017-08-14 09:31:01 +05:30
mbauskar
41d77e8d86 Merge branch 'hotfix' 2017-08-14 09:31:00 +05:30
mbauskar
b2f160eef0 bumped to version 8.8.2 2017-08-14 10:01:00 +06:00
Shreya Shah
67e2ef30c4 [UI test] Buying module - Get Supplier Quotations (#10375)
* Get quotations for Suppliers

* Calculate taxes and charges for Supplier quotations

* Added paths for tests

* Codacy fix

* Improvised the page route function
2017-08-14 09:17:00 +05:30
tundebabzy
041b9c3c32 make item name read only and add hide if not saved (#10382) 2017-08-14 09:16:07 +05:30
Vishal Dhayagude
22baba2cff [UI TEST] Test added for Delivery Note (#10376) 2017-08-11 17:17:30 +05:30
Faris Ansari
7273cb7f54 Track changes in Account doctype (#10373) 2017-08-11 16:19:28 +05:30
Faris Ansari
5a13087939 more styling 2017-08-11 15:49:23 +05:30
Vishal Dhayagude
4157b64776 [UI Test] Multiple UI Test for Stock Entry added (#10354) 2017-08-11 12:06:16 +05:30
Shreya Shah
9e30969243 Fetching items from material requests doctype (#10363) 2017-08-11 12:02:35 +05:30
Rushabh Mehta
dbb5154f37 Fixes in Order / Quotation (#10361)
* Additions in Order Page for Sidebar Menu with "Order" page route

* Adjust Columns in order_taxes.html to avoid number breaks for more precisions

* Fields additions in transaction_row.html

* [fix] style for order pages, indicator for quotation etc

* [fix] style for order pages, indicator for quotation etc

* [test] add timeout
2017-08-10 21:06:09 +05:30
Faris Ansari
f7c7ff4aae Styling for search fields 2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6 Add clusterize, move customer field to POSCart, get POS profile 2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979 [wip] New POS UI 2017-08-10 17:17:49 +05:30
Shreya Shah
5ae39ae79a Get Quotation requests and send emails to suppliers (#10356) 2017-08-10 16:20:47 +05:30
rohitwaghchaure
2e8232e7aa [Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320) 2017-08-10 11:32:59 +05:30
Makarand Bauskar
aac8349391 [hotfix] remove the white spaces from condition and formula fields (#10331)
* [hotfix] remove the white spaces from condition and formula fields

* [tests] added tests cases for whitespaces in formula and condition fields
2017-08-10 11:25:49 +05:30
Manas Solanki
a854ea00a5 mark holiday in the employee monthly attendance sheet (#10349) 2017-08-10 11:20:58 +05:30
Manas Solanki
e97f587411 send the email via the background worker in the payment request (#10350) 2017-08-10 11:17:38 +05:30
rohitwaghchaure
35438b6fc0 [Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity (#10351) 2017-08-10 11:15:50 +05:30
Rushabh Mehta
17e5f4132c [tests] less verbose logs 2017-08-10 11:03:26 +05:30
mbauskar
08c3f4758e Merge branch 'develop' into staging 2017-08-10 10:58:17 +05:30
mbauskar
5039d6de6f Merge branch 'develop' into staging 2017-08-10 10:56:33 +05:30
Zarrar
14468e79a3 [ui test] Student assessment and result (#10353)
* updated to test more thoroughly

* backbone set to generate result

* rebased with develop
2017-08-10 10:56:22 +05:30
Shreya Shah
243f091b30 Get supplier details (#10352) 2017-08-10 10:51:47 +05:30
Vishal Dhayagude
e05c2e5d95 [UI Test] for Stock Entery (#10346) 2017-08-09 17:36:04 +05:30
rohitwaghchaure
5999ade43a [Fix] Auto batch creation not working for purchase invoice is update stock is enabled (#10348) 2017-08-09 17:24:13 +05:30
Vishal Dhayagude
bde05e96a6 [UI TEST] Multiple test for Materail request (#10347) 2017-08-09 16:56:14 +05:30
Vishal Dhayagude
da30a69ee7 [UI Test] test added for Material Request (#10338)
* [UI Test] test added for Material Request

* [mod] date in material request
2017-08-09 13:08:38 +05:30
mbauskar
353956a864 Merge branch 'hotfix' 2017-08-09 11:17:55 +05:30
mbauskar
42251da131 Merge branch 'master' into develop 2017-08-09 11:17:55 +05:30
mbauskar
3e29a28cee bumped to version 8.8.1 2017-08-09 11:47:55 +06:00
Makarand Bauskar
60fcf47f6a [hotfix] changed the modified date for quotation (#10337) 2017-08-09 11:15:18 +05:30
Rushabh Mehta
dfd8f9b0ce [docs] move calculate-incentive-for-sales-team.md 2017-08-09 10:49:59 +05:30
Rushabh Mehta
c957ce161f [fix] titles 2017-08-09 10:46:17 +05:30
Rushabh Mehta
67884cb7cf [fix] remove 2fa from wizard docs 2017-08-09 10:46:17 +05:30
Zarrar
17e35e6ac7 [ui tests] Student attendance and leave application (#10326)
* spelling error rectified

* setting up leave application

* marking attendance and checking

* typo error fixed
2017-08-08 18:24:15 +05:30
Vishal Dhayagude
135560e170 [UI Test] Multiple UI Test for Quotation (#10330) 2017-08-08 18:22:53 +05:30
rohitwaghchaure
468fb97c81 [Fix] Lead address not able to select on the quotation (#10328) 2017-08-08 17:27:58 +05:30
Doridel Cahanap
96e52be5f1 [Enhancement] Allow Sidebar Menu record search using text from Item Name of a record (#10324)
* Search Record in Sidebar Menu Using Item Name for Order Page

* Test Case to create 2 Quotations with different Items
2017-08-08 17:12:50 +05:30
mbauskar
53f0f62f1c Merge branch 'master' into develop 2017-08-08 16:07:57 +05:30
mbauskar
39ec7dc658 Merge branch 'staging' 2017-08-08 16:07:56 +05:30
mbauskar
e77102ea47 bumped to version 8.8.0 2017-08-08 16:37:56 +06:00
Nabin Hait
7f476b4528 The series added for Asset Depreciation Entry (#10268) 2017-08-08 15:01:02 +05:30
Makarand Bauskar
b985ad2a8e [minor] fixes for pos_profile in make-demo (#10289) 2017-08-08 15:00:30 +05:30
ckosiegbu
1ac6bcba23 Removal of SMS Settings and SMS Parameters from ERPNext (#10033)
* Removal of SMS Settings and SMS Parameter from ERPNext.

* [DOCS]Documentation for Two Factor Authentication

* [Patch]Point SMS module to frappe core

* Rearrange doc help index.txt to fit

* [DOCS]Update Documentation for Two Factor Authentication
2017-08-08 14:55:30 +05:30
Nabin Hait
32992d555d Added chart of accounts for Argentina, France, Brazil and Hungary (#10312) 2017-08-08 14:42:04 +05:30
KanchanChauhan
71088aa2bd Supplier Part No in Purchase Receipt since it exits in Purchase Order (#10314) 2017-08-08 14:41:35 +05:30
mbauskar
1065679720 Merge branch 'master' into staging 2017-08-08 12:54:12 +05:30
mbauskar
6b0b7912c4 Merge branch 'master' into develop 2017-08-08 12:54:12 +05:30
mbauskar
35167be0d9 Merge branch 'hotfix' 2017-08-08 12:54:11 +05:30
mbauskar
1846d0fa2f bumped to version 8.7.3 2017-08-08 13:24:11 +06:00
Rushabh Mehta
09d1eaa87b [minor] standard filters 2017-08-08 12:00:04 +05:30
Zarrar
40343da1b0 Student group creation (#10308)
* auto-fills groups with students

* improvised and rectified tests

* increased timer to avoid rare failures

* removed duplicate code

* requested changes implemented

* changes implemented
2017-08-08 11:43:28 +05:30
Saurabh
3a4b6c2cba [fix] redirect to payment url if paying via web portal (#10265)
* [fix] redirect to payment url if paying via web portal

* [fix] test case fix

* [fix] test case fixes
2017-08-08 11:29:11 +05:30
KanchanChauhan
255c5f4407 Supplier Delivery Note field added to Purchase Receipt, good to have for future references (#10309) 2017-08-08 11:23:45 +05:30
rohitwaghchaure
9ef1d0f5a5 [Fix] Balance sheet not working (#10311) 2017-08-08 11:23:25 +05:30
Nabin Hait
738d8c2e0f Changed patch order to reload domain 2017-08-08 11:15:13 +05:30
Manas Solanki
c0fb428075 print format for the assessment report (#10227)
* print format for the assessment report

* fix for the comma in assessment plan
2017-08-07 13:54:39 +05:30
Nabin Hait
632f7673d5 Added total row in GST reports (#10292) 2017-08-07 13:50:16 +05:30
Nabin Hait
79005e83d7 Merge pull request #10293 from ashwinisave35/knowledge_base_button
Changed Text of Knowledge base button to Help Article
2017-08-07 13:50:02 +05:30
Nabin Hait
19128134a8 Merge pull request #10295 from tundebabzy/issue-10099-2
BOM Currency symbol issue (#10099) - Stock Ledger report
2017-08-07 13:49:22 +05:30
tunde
80a9f37272 add options in get_columns 2017-08-04 12:08:09 +01:00
Ashwini Save
cbef770ed7 Changed Text of Knowledge base button to Help Article 2017-08-04 16:14:38 +05:30
Nabin Hait
51b4167cdd Merge pull request #10269 from tundebabzy/currency-issues
BOM - Currency symbol issue (#10099)
2017-08-04 15:36:35 +05:30
Zarrar
82d2828be6 [ui test] Student Group - manually and using creation tool (#10283)
* fixing issues in original files

* creating a student log

* student group - manually and using creation tool
2017-08-04 15:33:27 +05:30
mbauskar
4ef1e2046b Merge branch 'master' into staging 2017-08-04 14:08:57 +05:30
mbauskar
e770824568 Merge branch 'master' into develop 2017-08-04 14:08:57 +05:30
mbauskar
320fb13b37 Merge branch 'hotfix' 2017-08-04 14:08:56 +05:30
mbauskar
4796e8e317 bumped to version 8.7.2 2017-08-04 14:38:56 +06:00
rohitwaghchaure
87b6498e02 Merge pull request #10287 from rohitwaghchaure/fixed_test_case
Fixed test cases for dynamic link order
2017-08-04 14:00:41 +05:30
Rohit Waghchaure
499144fd86 Fixed test cases for dynamic link order 2017-08-04 13:30:59 +05:30
Makarand Bauskar
b96e239cc0 [hotfix] ignore if project type is None (#10284) 2017-08-04 11:40:23 +05:30
mbauskar
cce79255fe resolved merge conflicts 2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68 resolved merge conflicts 2017-08-04 11:07:07 +05:30
mbauskar
139db5ffe7 Merge branch 'hotfix' 2017-08-04 11:05:01 +05:30
mbauskar
8cf951b574 bumped to version 8.7.1 2017-08-04 11:35:01 +06:00
rohitwaghchaure
0c1d441aa3 Test case for dynamic link order (#10276) 2017-08-04 10:55:46 +05:30
rohitwaghchaure
5906ddf804 [Fix] View ledger button not disaplying in the head of an account (#10254)
* [Fix] View ledger button not disaplying in the head of an account

* Show view ledger button in account if user has permission to read GL Entry data
2017-08-04 10:52:01 +05:30
Zarrar
326acc3ecb [ui test] fixed tests that used fees in any way (#10279)
* course table dependency on fee structure bypassed

* testing related to fees removed

* added more students data

* codacy fix
2017-08-04 10:51:26 +05:30
Vishal Dhayagude
592add9f0a [UI Test] Sales Order with Shipping Rule and Pricing Rule Added (#10270)
* [UI Test] Sales Order with Shipping Rule Added

* [UI Test] Sales Order with Pricing Rule Added
2017-08-04 10:51:08 +05:30
Rushabh Mehta
1696294847 [fix] remove property setter for project type (#10277)
* [fix] remove property setter for project type

* [patch] project type
2017-08-04 10:50:56 +05:30
Ameya Shenoy
4331067e57 [ui-test] completed tests for manufacturing (#10218)
* modified test_item to include child table assertions

* minor travis fixes

* removed css selectors and used cur_frm
2017-08-04 10:50:32 +05:30
rohitwaghchaure
046e1a6e28 [Fix] Patch broken if serial no has single quote (#10262) 2017-08-03 17:38:03 +05:30
Nabin Hait
ee5ff805e9 Book expense included in valuation only if perpetual inventory enabled (#10271) 2017-08-03 17:37:23 +05:30
mbauskar
329aae2458 Merge branch 'develop' into staging 2017-08-03 16:17:24 +05:30
Saurabh
33aaebac2b [fix] encode title and description in payment request (#10240) 2017-08-03 11:47:05 +05:30
Nabin Hait
af01f5154b Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-03 10:45:17 +05:30
Nabin Hait
b554f9077c Update set_write_permission_for_quotation_for_sales_manager.py 2017-08-03 10:44:55 +05:30
Nabin Hait
f7c1c2c812 Merge pull request #10260 from KanchanChauhan/field-name-change
[Minor] Changed country field name from "data_6" to "country"
2017-08-03 10:21:42 +05:30
Nabin Hait
bfb3de771b Merge pull request #10255 from tundebabzy/issue-10215
Error when creating Bank Entry from Process Payroll (#10215)
2017-08-03 10:20:31 +05:30
Nabin Hait
21045c456e Update process_payroll.py 2017-08-03 10:20:10 +05:30
Nabin Hait
5ebb9a0fc7 Merge pull request #10259 from pratu16x7/hotfix
[hotfix] website stock not shown due to discount not set
2017-08-03 10:19:13 +05:30
Kanchan Chauhan
1fd17a9a67 [Minor] Country field name should be country 2017-08-03 10:18:43 +05:30
tunde
7663bbadb9 edit Doctypes to use company currency 2017-08-03 00:05:56 +01:00
tunde
4a263c714d get_party_detail should use default currency of party 2017-08-02 22:26:39 +01:00
pratu16x7
7587b19d1b [fix] website stock not shown due to discount not set 2017-08-02 22:14:51 +05:30
tunde
919c9db1b0 indicator should be red 2017-08-02 15:19:24 +01:00
Nabin Hait
f5dee777dd minor fix in applying pricing rule 2017-08-02 19:08:39 +05:30
tunde
3b8b3fe766 Merge branch 'hotfix' into issue-10215 2017-08-02 14:27:56 +01:00
tunde
85adbd7eae show message if there's no submitted salary slip 2017-08-02 14:20:24 +01:00
tunde
c697526382 except in python 3 compatible style 2017-08-02 14:20:23 +01:00
mbauskar
2dd57acdef removed merge conflicts 2017-08-02 18:39:04 +05:30
mbauskar
99350db5e1 Merge branch 'staging' 2017-08-02 18:35:51 +05:30
mbauskar
478ffb9ae3 bumped to version 8.7.0 2017-08-02 19:05:51 +06:00
mbauskar
73dc35ddbf resolved merge conflicts 2017-08-02 18:24:03 +05:30
Rohit Waghchaure
250e964205 Set write permission to sales manger for permlevel 1 in Quotation doctype 2017-08-02 18:23:39 +05:30
mbauskar
ee090a9a3c Merge branch 'master' into develop 2017-08-02 18:18:14 +05:30
mbauskar
22a5e79b9a Merge branch 'hotfix' 2017-08-02 18:18:14 +05:30
mbauskar
4d49a7f6d1 bumped to version 8.6.6 2017-08-02 18:48:14 +06:00
Makarand Bauskar
ce436b7698 [minor] set description to '' if template description is not available (#10244) 2017-08-02 18:16:53 +05:30
rohitwaghchaure
ec9430dae7 [Fix] Default selling settings not fetched on customer quick entry form (#10243) 2017-08-02 18:16:13 +05:30
Faris Ansari
578624db1f Fix column width in GST Tax Breakup (#10230) 2017-08-02 17:44:32 +05:30
Vishal Dhayagude
ed0b107a9f [UI Test] UI test added for Pricing Rule (#10237)
* [UI Test] UI test added for Pricing Rule

* [mod]minor chages in pricing rule test

* [fix] codacy fixed
2017-08-02 17:31:20 +05:30
Vishal Dhayagude
f9e4893d9d [UI Test] Test added for Shipping Rule (#10229)
* [UI Test] Test added for Shipping Rule

* [fix]Travis Failed
2017-08-02 17:16:46 +05:30
Vishal Dhayagude
f1f1b60a62 [UI Test ] Sales Order with tax and discount (#10225)
* [new] UI Test for Sales Order

* [fix] Codacy fixed

* Update test_sales_order_with_discount_on_grand_total.js

* Update test_sales_order_with_taxes_and_charges.js
2017-08-02 17:15:47 +05:30
Zarrar
78c6e34106 [ui test] student applicant and various actions that can be taken (#10221)
* msgprint error fixed

* student applicant, various actions and its dependencies
2017-08-02 11:25:49 +05:30
Nabin Hait
9641d5b1f4 Make payment entry button in expense claim and some minor cleanup 2017-08-01 17:38:48 +05:30
Nabin Hait
edba79e8f0 Update utils.py 2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott
38d4be8325 Update manuals. Fix codacy issues 2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott
118ceda46f Add Payment Entry for Expenses 2017-08-01 17:35:50 +05:30
Vishal Dhayagude
316477b422 [UI Tests] All sales order test in tests folders (#10211)
* [new] Sales order with_discount, multi_uom, delivery_date added

* [fix] All sales order test in tests folder
2017-08-01 17:16:21 +05:30
Nabin Hait
564e8b74dc Minor fixing in setting cumulative tax amount 2017-08-01 16:35:22 +05:30
Nabin Hait
4ada637b17 Update taxes_and_totals.js 2017-08-01 16:20:59 +05:30
Nabin Hait
3a512af0e2 Merge pull request #10202 from nabinhait/hotfix
Minor fix in bom_stock_qty patch
2017-08-01 16:05:44 +05:30
Nabin Hait
1012bcdde5 Merge pull request #10210 from KanchanChauhan/this-is-me
[URGENT] "this" is "me"
2017-08-01 16:03:54 +05:30
Kanchan Chauhan
d0c5b3eb07 [URGENT] this is me 2017-08-01 16:02:01 +05:30
Nabin Hait
9b2b42dfc1 Minor fix in bom_stock_qty patch 2017-08-01 11:10:29 +05:30
Makarand Bauskar
317888211a merged hotfix branch into staging (#10191)
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)

* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)

This reverts commit 4d2e782e42.

* [Fix] Unable to save asset because of float error issue (#10157)

* bumped to version 8.6.4

* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)

* Set billing hours to 0 in timesheet #9535 (#10139)

* `update_billing_hours` to use flt not cint

* if not billable, reset billable hours

* if not billable, reset time rates

* test

* [Fix] Timesheet Company Issue

* Added delivery date in SO parent form. Fixes #10104 (#10155)

* Added delivery date in SO parent form. Fixes #10104

* UI tests for sales order delivery date

* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
Nabin Hait
cd95134267 Rounding issue in tax calculation (#10135)
* Adjust rounding loss of discount in the last item row. Fixes #8952

* Fixed rounding issue in tax calculation. Fixes #8953, #8952, #8893, #6954, #8910

* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Rushabh Mehta
1fb4abc322 [docs] cleanup 2017-07-31 17:40:17 +05:30
Vishal Dhayagude
95dfe27bf7 [UI Test] Sales Order with multi currency and tax (#10189)
* [UI Test] Sales Order with multi currency and tax

* [fix]Codacy fixed

* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Rushabh Mehta
4920d73adb [docs] remove {{docs_base_url}} 2017-07-31 16:41:35 +05:30
Rushabh Mehta
95349fe360 [docs] add headings 2017-07-31 16:21:12 +05:30
Faris Ansari
40d3ad2bb4 Add erpnext-grey.png, add logo in footer (#10101)
* Add erpnext-grey.png, footer html

* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Makarand Bauskar
98b52a7245 resolved merge conflicts on develop (#10185)
* resolved merge conflicts on develop

* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0 resolved merge conflicts 2017-07-31 12:30:53 +05:30
mbauskar
4d185f3541 Merge branch 'hotfix' 2017-07-31 12:21:35 +05:30
mbauskar
892cd615f8 bumped to version 8.6.5 2017-07-31 12:51:35 +06:00
Nabin Hait
495ef67caa Added delivery date in SO parent form. Fixes #10104 (#10155)
* Added delivery date in SO parent form. Fixes #10104

* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Zarrar
35d3190822 [ui test] Setting up school course+program and their dependencies (#10142)
* setting up course and its dependencies

* rebasing with develop branch

* codacy fix

* added test for Program

* updated test-dada to maintain consistency with future tests
2017-07-31 11:05:52 +05:30
Ameya Shenoy
4e91f28ce5 [ui-testing] added test for production order (#10138)
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* added warehouses required for production order

* [ui-test] added production order test

* debugging travis failure
2017-07-31 11:02:28 +05:30
Nabin Hait
3beb1ba667 Merge pull request #10165 from rohitwaghchaure/production_order_company_issue
[Fix] Timesheet Company Issue
2017-07-29 18:20:12 +05:30
Rohit Waghchaure
33977827c4 [Fix] Timesheet Company Issue 2017-07-29 14:15:50 +05:30
Nabin Hait
e09b507b6c Merge pull request #10062 from rohitwaghchaure/set_defualt_mode_payment
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-28 21:10:05 +05:30
Nabin Hait
1fcd2b0676 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 21:09:42 +05:30
tundebabzy
41c954b8b3 Set billing hours to 0 in timesheet #9535 (#10139)
* `update_billing_hours` to use flt not cint

* if not billable, reset billable hours

* if not billable, reset time rates

* test
2017-07-28 21:05:15 +05:30
Faris Ansari
482331b987 [fix] Default Warehouse not obeying form value (#10153) 2017-07-28 20:58:39 +05:30
rohitwaghchaure
e2176b852e [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160) 2017-07-28 20:52:02 +05:30
Utkarsh Yadav
8990af458b [ui test] leave application in HR (#10151)
* added test for leave application

* minor changes and path added

* travis fixes

* minor changes
2017-07-28 19:37:15 +05:30
Vishal Dhayagude
569011fb21 [UI Test] Test for Product Bundle added (#10158) 2017-07-28 19:36:50 +05:30
Britlog
4c7709efbd Portal breadcrumbs (#10095) 2017-07-28 18:54:22 +05:30
Rushabh Mehta
11a3d51774 [test] test_sales_order.py 2017-07-28 17:11:11 +05:30
mbauskar
9d5b1b0e8f Merge branch 'hotfix' 2017-07-28 16:03:52 +05:30
mbauskar
3b27382013 Merge branch 'master' into develop 2017-07-28 16:03:52 +05:30
mbauskar
2b420f7038 bumped to version 8.6.4 2017-07-28 16:33:52 +06:00
rohitwaghchaure
353af64197 [Fix] Unable to save asset because of float error issue (#10157) 2017-07-28 15:55:46 +05:30
Rushabh Mehta
be4fd1100d [fix] test 2017-07-28 15:54:07 +05:30
Makarand Bauskar
8bccaed35a Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)
This reverts commit 4d2e782e42.
2017-07-28 15:43:23 +05:30
Rushabh Mehta
8af33a513b [fix] test 2017-07-28 15:34:20 +05:30
rohitwaghchaure
4d2e782e42 [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148) 2017-07-28 15:21:22 +05:30
Rushabh Mehta
e16ec0c891 [minor] change docs_base_url 2017-07-28 14:56:59 +05:30
Makarand Bauskar
20f4d7f559 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2 User Permissions Redesign (#10006)
* [fixes] for user permission

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions

* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
bcornwellmott
bab0c5a8a5 Add disable check for Activity Type (#10120)
* Add disable check for Activity Type

* Add check for disabled in Timesheet

* Codacy fixes

* Fixed bugs

* Restore permissions
2017-07-28 14:32:45 +05:30
Rushabh Mehta
bead70b43a Docs in website (#10149)
* [docs] move to erpnext.org

* [docs]

* [minor] add title
2017-07-28 11:44:08 +05:30
Utkarsh Yadav
1c8d8a9720 [ui test] leave type,leave control panel and leave allocation in HR (#10136)
* changes in attendance

* added test for leave type

* added test for leave control panel

* added test for leave allocation

* codacy fixes
2017-07-28 11:40:29 +05:30
Rushabh Mehta
d50da78f28 [fixes] errors caught on flake8 (#10126) 2017-07-28 11:39:01 +05:30
Rushabh Mehta
2653825d25 [fix] flake8 verison 2017-07-28 11:37:45 +05:30
Rohit Waghchaure
120b6c0b3c UI test cases and documentation 2017-07-28 01:52:10 +05:30
Rohit Waghchaure
5296e3c321 [enhance] Provision to set default mode of payment for the POS in POS profile 2017-07-27 19:17:05 +05:30
Saurabh
c07741d36f Merge branch 'master' into staging 2017-07-27 17:50:28 +05:30
Saurabh
734e635ef6 Merge branch 'hotfix' 2017-07-27 17:50:27 +05:30
Saurabh
8907f1d2c3 Merge branch 'master' into develop 2017-07-27 17:50:27 +05:30
Saurabh
6f9ef5b890 bumped to version 8.6.3 2017-07-27 18:20:27 +06:00
Zarrar
c54510660e [ui test] Minor files (#10133)
* added permissions for Administrator user

* updated files

* minor files for future tests

* added entry for all tests
2017-07-27 17:19:06 +05:30
Makarand Bauskar
145393b12f [hotfix] set the account name in GL entry instead of warehouse (#10134) 2017-07-27 16:46:40 +05:30
Makarand Bauskar
9c6e2c3637 [hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127) 2017-07-27 16:23:57 +05:30
mbauskar
cfc2693b2e Merge branch 'hotfix' 2017-07-27 12:18:15 +05:30
mbauskar
7b764d03c2 Merge branch 'master' into develop 2017-07-27 12:18:15 +05:30
mbauskar
448d919cc1 bumped to version 8.6.2 2017-07-27 12:48:15 +06:00
Vishal Dhayagude
b528411ed1 [ui test]sales and taxes charges template (#10116) 2017-07-27 12:15:06 +05:30
Utkarsh Yadav
b8b01928d3 [ui test] employee attendance tool and attendance in HR (#10112)
* added test for attendance tool

* added test for attendance

* minor changes

* minor changes

* path added in tests.txt

* codacy fixes
2017-07-27 11:49:10 +05:30
tundebabzy
296603a861 auto populate all rows (#10090) 2017-07-27 11:47:56 +05:30
tundebabzy
84227a6c54 Employee Loan Should Be Limited To Employee Company (#10039) (#10093)
* filter employee drop down by company name

* codacy fix
2017-07-27 11:47:03 +05:30
tundebabzy
9281013d51 add transaction date call to get_exchange_rate (#10109) 2017-07-27 11:43:32 +05:30
tundebabzy
87ec6a12ef adds options to currency fields (#10118) 2017-07-27 11:38:17 +05:30
rohitwaghchaure
059f99e621 [Fix] Wrong avg. buying rate in the Gross Profit report (#10110) 2017-07-27 11:37:30 +05:30
rohitwaghchaure
8579dd1d78 [minor] If customer has removed getting an error (#10107) 2017-07-27 11:21:54 +05:30
cclauss
6848708377 old style exception, raise --> new style for Python 3 (#10082)
* old style raise --> raise() for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style raise --> raise() for Python 3

* old style raise --> raise() for Python 3

* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
Vishal Dhayagude
c67bf5026e [UI Test] Create tax account in Charts of account (#10105)
* [new]tax creation added

* [new]path added test.txt
2017-07-27 09:11:08 +05:30
Faris Ansari
fbec103ae7 Remove inline styling, add css classes (#10077) 2017-07-26 18:46:13 +05:30
Makarand Bauskar
1d9fd9aa52 [minor][wiz] fix company image alignment (#10114) (#10117) 2017-07-26 18:19:41 +05:30
KanchanChauhan
58c9934452 [fix] company graph based on base currency (#9950) 2017-07-26 18:17:11 +05:30
Prateeksha Singh
83535811ad [minor][wiz] fix company image alignment (#10114) 2017-07-26 18:11:37 +05:30
mbauskar
930dd5e54e Merge branch 'develop' into staging 2017-07-26 18:02:32 +05:30
KanchanChauhan
7800bd89dc Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929) 2017-07-26 17:55:25 +05:30
Utkarsh Yadav
53b877bd8f [ui test] Employee in HR (#10103)
* added test for employee

* names changed

* path added in tests.txt
2017-07-26 16:32:16 +05:30
Utkarsh Goswami
40937083bf [UI-Test Project] To check a billing cost of a project with multiple tasks (#10084)
* Updated test for Project Timesheet with multiple tasks

* Updated test for Project Timesheet with multiple tasks

* Updated test for Project Timesheet with multiple tasks

* updated:

* Updated

* Updated
2017-07-26 16:31:08 +05:30
Makarand Bauskar
d0109a6fc0 [minor] enable all roles and domain before running tests cases (#10108)
* [minor] enable all roles and domain before running tests cases

* Update utils.py
2017-07-26 16:29:22 +05:30
Utkarsh Yadav
b8a4a584e6 [ui test] test for department, designation, company and leave block list (#10085)
* added test for required items

* minor fixes for travis

* name changed

* added test for employment type

* travis fixes
2017-07-26 13:14:34 +05:30
Prateeksha Singh
cda6206c1f [minor][wiz] remove header brand image (#10016) 2017-07-26 13:05:48 +05:30
Saurabh
4c28fa77bd Merge branch 'hotfix' 2017-07-25 18:02:58 +05:30
Saurabh
7bdc45eceb Merge branch 'master' into develop 2017-07-25 18:02:58 +05:30
Saurabh
394dbca0e4 bumped to version 8.6.1 2017-07-25 18:32:58 +06:00
Saurabh
33ebd9f88e Merge pull request #10088 from saurabh6790/hot_fix_v_8_6_0
[hot][fix] updated modified date for sales order
2017-07-25 17:58:12 +05:30
Saurabh
4c1caa7e98 [hot][fix] updated modified date for sales order 2017-07-25 17:35:14 +05:30
Saurabh
dc6e369172 Merge branch 'master' into develop 2017-07-25 16:42:28 +05:30
Saurabh
08c3b3c925 Merge branch 'staging' 2017-07-25 16:42:27 +05:30
Saurabh
bb5812cf0f bumped to version 8.6.0 2017-07-25 17:12:26 +06:00
Saurabh
36645e4e2f Merge branch 'master' into staging 2017-07-25 16:15:51 +05:30
Saurabh
fb4f320df4 Merge branch 'master' into develop 2017-07-25 16:15:50 +05:30
Saurabh
b296bb1551 Merge branch 'hotfix' 2017-07-25 16:15:50 +05:30
Saurabh
e7c14fcc3d bumped to version 8.5.5 2017-07-25 16:45:49 +06:00
Saurabh
31bb34bbae Merge pull request #10081 from rohitwaghchaure/calendar_view_SO_issue_fix
[Fix] Calendar view for sales order
2017-07-25 15:54:09 +05:30
Saurabh
6436b9d089 Merge pull request #10080 from rohitwaghchaure/hotfix
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:43:00 +05:30
Rohit Waghchaure
d62fa84ed9 [Fix] Calendar view for sales order 2017-07-25 15:34:20 +05:30
Rohit Waghchaure
baa937aa52 [Fix] Negative amount showing in the grand total for multicurrency if discount has applied 2017-07-25 15:26:01 +05:30
Ameya Shenoy
08450878f1 [ui-test] added test for bill_of_materials (#10063)
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* fixed minor codacy problems

* added minor requested changes
2017-07-25 15:23:58 +05:30
Ashwini Save
2ffe878999 Timeline Title for small resolution Add to knowledge base button. (#9926)
* Add to Knowledge Base button class updated to hide for mobile view.

* Updated code to avoid multiple occurance of Knowledge Base button while updating comment.
2017-07-25 14:16:48 +05:30
rohitwaghchaure
49a6b4a4fa [Fix] RFQ list showing to all supplier in the portal (#10023) 2017-07-25 14:12:58 +05:30
bcornwellmott
05e51d6c83 Add Get Suppliers dialog (#10025)
* Add Get Suppliers dialog

* Commonize code, use depends_on

* Update request_for_quotation.js
2017-07-25 14:10:23 +05:30
rohitwaghchaure
4cccdbdbf9 [Fix] Validating price list currency even if price list is not defined (#10056) 2017-07-25 14:05:01 +05:30
KanchanChauhan
4b888b95d0 [Minor] Added filter condition to Customer Query (#10057) 2017-07-25 14:03:01 +05:30
Zarrar
b5ec8381a6 [UI Tests] School Academic Term test (#10050) 2017-07-25 11:46:34 +05:30
Frappe PR Bot
3b128cabb2 [Translation] Updated Translations (#10047) 2017-07-25 11:46:16 +05:30
Zarrar
1c6828e5d6 [UI Tests] School Academic Year test (#10049) 2017-07-25 11:45:39 +05:30
KanchanChauhan
d65b4b4238 Patch was faling, reload doc was missing (#10072) 2017-07-25 11:39:46 +05:30
ci2014
13abada526 Update email-account.md (#10066)
* Update email-account.md

Add information to conditional import

* Add files via upload
2017-07-25 11:06:03 +05:30
tundebabzy
de54f3019f use api to get default cost center for chosen company (#10067) 2017-07-25 11:05:07 +05:30
bcornwellmott
d023d9a0bd Add RFQ email sent check (#10068)
* Add RFQ email sent check

* remove blankspace

* Removed debugger
2017-07-25 11:03:12 +05:30
Vishal Dhayagude
edb2749dfd Timesheet web (#10037)
* [new]Timesheet added

* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Makarand Bauskar
fcaf313c0f [minor] make-demo fixes for manufacturing domain (#10029) 2017-07-25 10:49:35 +05:30
Makarand Bauskar
dfc5a454b3 [minor] fixed the delivery date issue in Ordered Item to be Dellivered report (#10028) 2017-07-25 10:48:43 +05:30
bcornwellmott
1c32f5ace9 Whitelist method for adding production orders ops (#9997) 2017-07-24 22:43:44 +05:30
bcornwellmott
96381da547 Supplier Scorecard (#9294)
* Initial start of scorecard docs

* Got basic functionality working

* Fixed doc names and added key functions

* Basic functional version minus Actions

* Hide scorecard docs until functional

* Created supplier scorecard documentation

* Added default variables and standings. Added restrictions for PO + RFQ

* Automatic daily scorecard creation + on save

* Added warning for PO nd RFQs

* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo

* Added tests, fixed codacy formatting, small improvements

* Fixed test bug w/ criteria. Codacy cleanup

* Fixed codacy issues. Fixed sticky criteria

* Fixed bug with period search. Remove blank variable child.

* Updated docs, automatically add criteria and standings, clean up period create message

* Uncommented test, set docs to beta

* Fix for nabinhait review

* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Ameya Shenoy
91b2833708 [ui-tests] added workstation and operation (#10044)
* [ui-test] workstation and operation testing added

* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
2017-07-24 14:34:30 +05:30
Utkarsh Yadav
20a862a6b9 [ui test] holiday list and branch in HR (#10045)
* added test for holiday list

* codacy fixes

* added check for all days in list

* added test for branch

* codacy fixe

* minor fixes
2017-07-24 14:33:42 +05:30
tundebabzy
65656ec2df hide salution and gender if company type is Company (#10040) 2017-07-24 11:32:26 +05:30
Makarand Bauskar
9306aff1bb [minor] moved the patch to v8_5 and other minor fixes (#10012)
* Quotation and Supplier Quotation Route and Permission Edits

* [minor] moved the patch to v8_5 and other minor fixes
2017-07-21 15:19:47 +05:30
Ameya Shenoy
73f969fd7f [ui-test] manufacturing item creation testing (#10009) 2017-07-21 14:22:08 +05:30
Prateeksha Singh
283d5550e6 [fix] set sales base field as base_grand_total (#10008) 2017-07-21 14:21:35 +05:30
Rushabh Mehta
dda608dd00 [fix] update_company_current_month_sales in company.py (#10005) 2017-07-21 11:58:14 +05:30
Faris Ansari
e355f99786 Remove ellipsis in title and description (#9992) 2017-07-20 17:51:19 +05:30
mbauskar
27334c28a9 Merge branch 'hotfix' 2017-07-20 16:49:30 +05:30
mbauskar
6c8d4678db Merge branch 'master' into develop 2017-07-20 16:49:30 +05:30
mbauskar
ea50c9d1be bumped to version 8.5.4 2017-07-20 17:19:30 +06:00
Rushabh Mehta
35da7d1fb4 [minor] we buy is also checked by default 2017-07-20 15:58:20 +05:30
Rushabh Mehta
ced14cc789 [fix] setup-wizard 2017-07-20 15:55:54 +05:30
Rushabh Mehta
9d27cf3c62 [tests] refactored (#9984)
* [tests] refactored

* [fix] test_quotation.js

* [fix] tests.text

* [fix] fiscal year not needed

* [test] add long test

* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8 resolved merge conflicts 2017-07-20 14:19:47 +05:30
tundebabzy
11d23f84d7 Can't set Start and End Dates in Salary Slip (#9513) (#9944)
* remove trigger from end_date

* adds new function `get_end_date`:
- it tries to calculate the appropriate end date for a given frequency
- returns an empty string if frequency is 'biweekly'
- adds test cases

* changes logic in `set_start_end_dates`:
- if start_date is empty in form, call process_payroll.get_start_end_dates
- else, call process_payroll.get_end_date

* `get_end_date` should return a dict

* changed "biweekly" to "bimonthly"

* change the behaviour of process payroll start and end date:
- when payroll frequency is changed, change start/end date as usual
- if start date is manually changed, use the frequency to calculate the end date

* clean up

* further cleanup

* in `get_end_date`, if `frequency` isn"t given, "monthly"

* remove end_date from cscript and introduce `set_end_date`

* fix tests

* removed whitespaces
2017-07-20 10:33:03 +05:30
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933)
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Makarand Bauskar
ac9b1332d2 [minor] set no copy to sales goal fields (#9956) 2017-07-19 18:55:12 +05:30
Doridel Cahanap
7b021e0fac Show Expected End Date in Project List View (#9964) 2017-07-19 18:21:31 +05:30
KanchanChauhan
d6dd25a666 Added indicators on Project Tasks (#9952) 2017-07-19 18:06:52 +05:30
_JG_
96bb6099d6 [fix] correctly choice 'Credit Limit' (#9932)
* [fix] correctly choice 'credit limit'

If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings

* Update party.py

* [fix] correctly choice 'Credit Limit'
2017-07-19 10:27:09 +05:30
Nabin Hait
e6c2ae3682 Merge pull request #9940 from rmehta/workstation-form
[ux] workstation form layout
2017-07-19 10:24:28 +05:30
Nabin Hait
8d56f2959b Merge pull request #9942 from bcornwellmott/bix_bom_qty
Update qty from stock_qty before validate materials
2017-07-19 10:22:00 +05:30
Rushabh Mehta
d2d24554b3 [ux] workstation form layout 2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott
c7d2bc67e8 Update qty from stock_qty before validate materials 2017-07-18 08:56:25 -07:00
Rushabh Mehta
1283f6308d [fix] company graph based on base currency 2017-07-18 18:22:16 +05:30
mbauskar
d36c136fc6 Merge branch 'master' into develop 2017-07-18 16:38:24 +05:30
Nabin Hait
bc3acdd0ba Merge pull request #9510 from tundebabzy/issue-9166
Unable to create Manual Depreciation of Asset due to Error #9166
2017-07-18 15:44:18 +05:30
tunde
78d2f542d0 code fix as per review 2017-07-17 15:00:45 +01:00
tunde
1ee534889f Revert "adds if statement for reference_type === "Asset""
This reverts commit c7e3a09cfb.
2017-07-17 13:27:59 +01:00
tunde
690de64734 Merge branch 'develop' into issue-9166 2017-06-28 13:37:04 +01:00
tunde
c7e3a09cfb adds if statement for reference_type === "Asset" 2017-06-28 13:23:18 +01:00
6652 changed files with 747679 additions and 338955 deletions

View File

@@ -4,6 +4,10 @@
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"extends": "eslint:recommended",
"rules": {
"indent": [
@@ -50,9 +54,9 @@
"root": true,
"globals": {
"frappe": true,
"Vue": true,
"erpnext": true,
"schools": true,
"hub": true,
"$": true,
"jQuery": true,
"moment": true,
@@ -132,6 +136,13 @@
"get_url_arg": true,
"get_server_fields": true,
"set_multiple": true,
"QUnit": true
"QUnit": true,
"Chart": true,
"Cypress": true,
"cy": true,
"it": true,
"context": true,
"before": true,
"beforeEach": true
}
}

47
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,47 @@
---
name: Bug report
about: Report a bug encountered while using ERPNext
labels: bug
---
<!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
- For documentation issues, refer to https://github.com/frappe/erpnext_com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a bug report, make sure you provide all required information. The easier it is for
maintainers to reproduce, the faster it'll be fixed.
4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
-->
## Description of the issue
## Context information (for bug reports)
**Output of `bench version`**
```
(paste here)
```
## Steps to reproduce the issue
1.
2.
3.
### Observed result
### Expected result
### Stacktrace / full error message
```
(paste here)
```
## Additional information
OS version / distribution, `ERPNext` install method, etc.

View File

@@ -0,0 +1,28 @@
---
name: Feature request
about: Suggest an idea to improve ERPNext
labels: feature-request
---
<!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
- For documentation issues, refer to https://github.com/frappe/erpnext_com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
-->
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@@ -0,0 +1,17 @@
---
name: Question about using ERPNext
about: This is not the appropriate channel
labels: invalid
---
Please post on our forums:
for questions about using `ERPNext`: https://discuss.erpnext.com
for questions about using the `Frappe Framework`: https://discuss.frappe.io
for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)
For documentation issues, use the [ERPNext Documentation](https://erpnext.com/docs/) or [Frappe Framework Documentation](https://frappe.io/docs/user/en) or the [developer cheetsheet](https://github.com/frappe/frappe/wiki/Developer-Cheatsheet)
> **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.**

33
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,33 @@
<!--
Some key notes before you open a PR:
1. Select which branch should this PR be merged in?
2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
3. All tests pass locally, UI and Unit tests
4. All business logic and validations must be on the server-side
5. Update necessary Documentation
6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes
Also, if you're new here
- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Updating-Documentation
- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md
- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
-->
> Please provide enough information so that others can review your pull request:
<!-- You can skip this if you're fixing a typo or updating existing documentation -->
> Explain the **details** for making this change. What existing problem does the pull request solve?
<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
> Screenshots/GIFs
<!-- Add images/recordings to better visualize the change: expected/current behviour -->

34
.github/stale.yml vendored Normal file
View File

@@ -0,0 +1,34 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 30
# Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- hotfix
# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false
# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true
# Label to use when marking as stale
staleLabel: inactive
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This pull request has been automatically marked as stale because it has not had
recent activity. It will be closed within a week if no further activity occurs, but it
only takes a comment to keep a contribution alive :) Also, even if it is closed,
you can always reopen the PR when you're ready. Thank you for contributing.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30
# Limit to only `issues` or `pulls`
only: pulls

7
.gitignore vendored
View File

@@ -8,3 +8,10 @@ latest_updates.json
*.egg-info
dist/
erpnext/docs/current
*.swp
*.swo
__pycache__
*~
.idea/
.vscode/
node_modules/

1
.pylintrc Normal file
View File

@@ -0,0 +1 @@
disable=access-member-before-definition

View File

@@ -1,56 +1,80 @@
language: python
dist: trusty
language: python
git:
depth: 1
cache:
- pip
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
hosts: test_site
mariadb: 10.3
python:
- "2.7"
jobs:
include:
- name: "Python 2.7 Server Side Test"
python: 2.7
script: bench --site test_site run-tests --app erpnext --coverage
services:
- mysql
- name: "Python 3.6 Server Side Test"
python: 3.6
script: bench --site test_site run-tests --app erpnext --coverage
- name: "Python 2.7 Patch Test"
python: 2.7
before_script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
script: bench --site test_site migrate
- name: "Python 3.6 Patch Test"
python: 3.6
before_script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
script: bench --site test_site migrate
install:
- sudo rm /etc/apt/sources.list.d/docker.list
- sudo apt-get purge -y mysql-common mysql-server mysql-client
- nvm install v7.10.0
- wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
- sudo python install.py --develop --user travis --without-bench-setup
- sudo pip install -e ~/bench
- cd ~
- nvm install 10
- rm $TRAVIS_BUILD_DIR/.git/shallow
- bash $TRAVIS_BUILD_DIR/travis/bench_init.sh
- cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
- git clone https://github.com/frappe/bench --depth 1
- pip install -e ./bench
before_script:
- wget http://chromedriver.storage.googleapis.com/2.27/chromedriver_linux64.zip
- unzip chromedriver_linux64.zip
- sudo apt-get install libnss3
- sudo apt-get --only-upgrade install google-chrome-stable
- sudo cp chromedriver /usr/local/bin/.
- sudo chmod +x /usr/local/bin/chromedriver
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3
- mysql -u root -ptravis -e 'create database test_frappe'
- echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
- echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
- git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
- bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench
- mkdir ~/frappe-bench/sites/test_site
- cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/
- mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
- mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
- mysql -u root -e "CREATE DATABASE test_frappe"
- mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
- mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
- mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
- mysql -u root -e "FLUSH PRIVILEGES"
- wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
- tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
- sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
- sudo chmod o+x /usr/local/bin/wkhtmltopdf
- cd ~/frappe-bench
- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site
- bench reinstall --yes
- bench build
- bench scheduler disable
- bench start &
- sleep 10
script:
- set -e
- bench --verbose run-tests
- sleep 5
- bench --verbose run-ui-tests --app erpnext
- sed -i 's/watch:/# watch:/g' Procfile
- sed -i 's/schedule:/# schedule:/g' Procfile
- sed -i 's/socketio:/# socketio:/g' Procfile
- sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench start &
- bench --site test_site reinstall --yes
after_script:
- pip install python-coveralls
- coveralls -b apps/erpnext -d ../../sites/.coverage

13
.travis/site_config.json Normal file
View File

@@ -0,0 +1,13 @@
{
"db_name": "test_frappe",
"db_password": "test_frappe",
"auto_email_id": "test@example.com",
"mail_server": "smtp.example.com",
"mail_login": "test@example.com",
"mail_password": "test",
"admin_password": "admin",
"root_login": "root",
"root_password": "travis",
"host_name": "http://test_site:8000",
"install_apps": ["erpnext"]
}

View File

@@ -1,20 +0,0 @@
include MANIFEST.in
include requirements.txt
include *.json
include *.md
include *.py
include *.txt
include .travis.yml
recursive-include erpnext *.txt
recursive-include erpnext *.css
recursive-include erpnext *.csv
recursive-include erpnext *.html
recursive-include erpnext *.ico
recursive-include erpnext *.js
recursive-include erpnext *.json
recursive-include erpnext *.md
recursive-include erpnext *.png
recursive-include erpnext *.py
recursive-include erpnext *.svg
recursive-include erpnext/public *
recursive-exclude * *.pyc

View File

@@ -1,15 +1,23 @@
# ERPNext - ERP made simple
<div align="center">
<img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
<h2>ERPNext</h2>
<p align="center">
<p>ERP made simple</p>
</p>
[![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.com/frappe/erpnext.svg)](https://travis-ci.com/frappe/erpnext)
[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
[![Coverage Status](https://coveralls.io/repos/github/frappe/erpnext/badge.svg?branch=develop)](https://coveralls.io/github/frappe/erpnext?branch=develop)
[https://erpnext.com](https://erpnext.com)
</div>
Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
- [User Guide](https://frappe.github.io/erpnext/)
- [Getting Help](http://erpnext.org/getting-help.html)
- [User Guide](https://erpnext.com/docs/user)
- [Discussion Forum](https://discuss.erpnext.com/)
---
@@ -32,7 +40,7 @@ System and user credentials are listed on the download page.
## License
GNU/General Public License (see LICENSE.txt)
GNU/General Public License (see [license.txt](license.txt))
The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
@@ -41,6 +49,7 @@ The ERPNext code is licensed as GNU General Public License (v3) and the Document
## Contributing
1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
1. [Report Security Vulnerabilities](https://erpnext.com/security)
1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
1. [Translations](https://translate.erpnext.com)
1. [Chart of Accounts](https://charts.erpnext.com)

7
SECURITY.md Normal file
View File

@@ -0,0 +1,7 @@
# Security Policy
The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

3
cypress.json Normal file
View File

@@ -0,0 +1,3 @@
{
"baseUrl": "http://test_site_ui:8000"
}

View File

@@ -0,0 +1,5 @@
{
"name": "Using fixtures to represent data",
"email": "hello@cypress.io",
"body": "Fixtures are a great way to mock data for responses to routes"
}

View File

@@ -0,0 +1,31 @@
context('Form', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.visit('/desk');
});
it('create a new opportunity', () => {
cy.visit('/desk#Form/Opportunity/New Opportunity 1');
cy.get('.page-title').should('contain', 'Not Saved');
cy.fill_field('opportunity_from', 'Customer', 'Select');
cy.fill_field('party_name', 'Test Customer', 'Link').blur();
cy.get('.primary-action').click();
cy.get('.page-title').should('contain', 'Open');
cy.get('.form-inner-toolbar button:contains("Lost")').click({ force: true });
cy.get('.modal input[data-fieldname="lost_reason"]').as('input');
cy.get('@input').focus().type('Higher', { delay: 200 });
cy.get('.modal .awesomplete ul')
.should('be.visible')
.get('li:contains("Higher Price")')
.click({ force: true });
cy.get('@input').focus().type('No Followup', { delay: 200 });
cy.get('.modal .awesomplete ul')
.should('be.visible')
.get('li:contains("No Followup")')
.click();
cy.fill_field('detailed_reason', 'Test Detailed Reason', 'Text');
cy.get('.modal button:contains("Declare Lost")').click({ force: true });
cy.get('.page-title').should('contain', 'Lost');
});
});

17
cypress/plugins/index.js Normal file
View File

@@ -0,0 +1,17 @@
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************
// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)
// module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
// }

View File

@@ -0,0 +1,25 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add("login", (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This is will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

22
cypress/support/index.js Normal file
View File

@@ -0,0 +1,22 @@
// ***********************************************************
// This example support/index.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************
// import frappe commands
import '../../../frappe/cypress/support/index';
// Import commands.js using ES2015 syntax:
import './commands';
// Alternatively you can use CommonJS syntax:
// require('./commands')

View File

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
import inspect
import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '8.5.3'
__version__ = '12.4.2'
def get_default_company(user=None):
'''Get default company for user'''
@@ -26,15 +27,25 @@ def get_default_currency():
'''Returns the currency of the default company'''
company = get_default_company()
if company:
return frappe.db.get_value('Company', company, 'default_currency')
return frappe.get_cached_value('Company', company, 'default_currency')
def get_default_cost_center(company):
'''Returns the default cost center of the company'''
if not company:
return None
if not frappe.flags.company_cost_center:
frappe.flags.company_cost_center = {}
if not company in frappe.flags.company_cost_center:
frappe.flags.company_cost_center[company] = frappe.get_cached_value('Company', company, 'cost_center')
return frappe.flags.company_cost_center[company]
def get_company_currency(company):
'''Returns the default company currency'''
if not frappe.flags.company_currency:
frappe.flags.company_currency = {}
if not company in frappe.flags.company_currency:
frappe.flags.company_currency[company] = frappe.db.get_value('Company', company, 'default_currency')
frappe.flags.company_currency[company] = frappe.db.get_value('Company', company, 'default_currency', cache=True)
return frappe.flags.company_currency[company]
def set_perpetual_inventory(enable=1, company=None):
@@ -47,7 +58,7 @@ def set_perpetual_inventory(enable=1, company=None):
def encode_company_abbr(name, company):
'''Returns name encoded with company abbreviation'''
company_abbr = frappe.db.get_value("Company", company, "abbr")
company_abbr = frappe.get_cached_value('Company', company, "abbr")
parts = name.rsplit(" - ", 1)
if parts[-1].lower() != company_abbr.lower():
@@ -63,19 +74,42 @@ def is_perpetual_inventory_enabled(company):
frappe.local.enable_perpetual_inventory = {}
if not company in frappe.local.enable_perpetual_inventory:
frappe.local.enable_perpetual_inventory[company] = frappe.db.get_value("Company",
company, "enable_perpetual_inventory") or 0
frappe.local.enable_perpetual_inventory[company] = frappe.get_cached_value('Company',
company, "enable_perpetual_inventory") or 0
return frappe.local.enable_perpetual_inventory[company]
def get_default_finance_book(company=None):
if not company:
company = get_default_company()
if not hasattr(frappe.local, 'default_finance_book'):
frappe.local.default_finance_book = {}
if not company in frappe.local.default_finance_book:
frappe.local.default_finance_book[company] = frappe.get_cached_value('Company',
company, "default_finance_book")
return frappe.local.default_finance_book[company]
def get_party_account_type(party_type):
if not hasattr(frappe.local, 'party_account_types'):
frappe.local.party_account_types = {}
if not party_type in frappe.local.party_account_types:
frappe.local.party_account_types[party_type] = frappe.db.get_value("Party Type",
party_type, "account_type") or ''
return frappe.local.party_account_types[party_type]
def get_region(company=None):
'''Return the default country based on flag, company or global settings
You can also set global company flag in `frappe.flags.company`
'''
if company or frappe.flags.company:
return frappe.db.get_value('Company',
company or frappe.flags.company, 'country')
return frappe.get_cached_value('Company',
company or frappe.flags.company, 'country')
elif frappe.flags.country:
return frappe.flags.country
else:
@@ -98,3 +132,16 @@ def allow_regional(fn):
return caller
def get_last_membership():
'''Returns last membership if exists'''
last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
return last_membership and last_membership[0]
def is_member():
'''Returns true if the user is still a member'''
last_membership = get_last_membership()
if last_membership and getdate(last_membership.to_date) > getdate():
return True
return False

View File

@@ -0,0 +1,58 @@
{
"custom_fields": [
{
"_assign": null,
"_comments": null,
"_liked_by": null,
"_user_tags": null,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible_depends_on": null,
"columns": 0,
"creation": "2018-12-28 22:29:21.828090",
"default": null,
"depends_on": null,
"description": null,
"docstatus": 0,
"dt": "Address",
"fetch_from": null,
"fieldname": "tax_category",
"fieldtype": "Link",
"hidden": 0,
"idx": 14,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"insert_after": "fax",
"label": "Tax Category",
"modified": "2018-12-28 22:29:21.828090",
"modified_by": "Administrator",
"name": "Address-tax_category",
"no_copy": 0,
"options": "Tax Category",
"owner": "Administrator",
"parent": null,
"parentfield": null,
"parenttype": null,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": null,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"translatable": 0,
"unique": 0,
"width": null
}
],
"custom_perms": [],
"doctype": "Address",
"property_setters": [],
"sync_on_migrate": 1
}

View File

@@ -0,0 +1,22 @@
frappe.provide('frappe.dashboards.chart_sources');
frappe.dashboards.chart_sources["Account Balance Timeline"] = {
method: "erpnext.accounts.dashboard_chart_source.account_balance_timeline.account_balance_timeline.get",
filters: [
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
reqd: 1
},
{
fieldname: "account",
label: __("Account"),
fieldtype: "Link",
options: "Account",
reqd: 1
},
]
};

View File

@@ -0,0 +1,13 @@
{
"creation": "2019-02-06 07:57:10.377718",
"docstatus": 0,
"doctype": "Dashboard Chart Source",
"idx": 0,
"modified": "2019-04-09 18:30:49.943174",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account Balance Timeline",
"owner": "Administrator",
"source_name": "Account Balance Timeline",
"timeseries": 1
}

View File

@@ -0,0 +1,116 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe, json
from frappe import _
from frappe.utils import add_to_date, date_diff, getdate, nowdate, get_last_day, formatdate
from erpnext.accounts.report.general_ledger.general_ledger import execute
from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_period_ending
from frappe.utils.nestedset import get_descendants_of
@frappe.whitelist()
@cache_source
def get(chart_name = None, chart = None, no_cache = None, from_date = None, to_date = None):
if chart_name:
chart = frappe.get_doc('Dashboard Chart', chart_name)
else:
chart = frappe._dict(frappe.parse_json(chart))
timespan = chart.timespan
if chart.timespan == 'Select Date Range':
from_date = chart.from_date
to_date = chart.to_date
timegrain = chart.time_interval
filters = frappe.parse_json(chart.filters_json)
account = filters.get("account")
company = filters.get("company")
if not account and chart:
frappe.throw(_("Account is not set for the dashboard chart {0}").format(chart))
if not to_date:
to_date = nowdate()
if not from_date:
if timegrain in ('Monthly', 'Quarterly'):
from_date = get_from_date_from_timespan(to_date, timespan)
# fetch dates to plot
dates = get_dates_from_timegrain(from_date, to_date, timegrain)
# get all the entries for this account and its descendants
gl_entries = get_gl_entries(account, get_period_ending(to_date, timegrain))
# compile balance values
result = build_result(account, dates, gl_entries)
return {
"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
"datasets": [{
"name": account,
"values": [r[1] for r in result]
}]
}
def build_result(account, dates, gl_entries):
result = [[getdate(date), 0.0] for date in dates]
root_type = frappe.db.get_value('Account', account, 'root_type')
# start with the first date
date_index = 0
# get balances in debit
for entry in gl_entries:
# entry date is after the current pointer, so move the pointer forward
while getdate(entry.posting_date) > result[date_index][0]:
date_index += 1
result[date_index][1] += entry.debit - entry.credit
# if account type is credit, switch balances
if root_type not in ('Asset', 'Expense'):
for r in result:
r[1] = -1 * r[1]
# for balance sheet accounts, the totals are cumulative
if root_type in ('Asset', 'Liability', 'Equity'):
for i, r in enumerate(result):
if i > 0:
r[1] = r[1] + result[i-1][1]
return result
def get_gl_entries(account, to_date):
child_accounts = get_descendants_of('Account', account, ignore_permissions=True)
child_accounts.append(account)
return frappe.db.get_all('GL Entry',
fields = ['posting_date', 'debit', 'credit'],
filters = [
dict(posting_date = ('<', to_date)),
dict(account = ('in', child_accounts)),
dict(voucher_type = ('!=', 'Period Closing Voucher'))
],
order_by = 'posting_date asc')
def get_dates_from_timegrain(from_date, to_date, timegrain):
days = months = years = 0
if "Daily" == timegrain:
days = 1
elif "Weekly" == timegrain:
days = 7
elif "Monthly" == timegrain:
months = 1
elif "Quarterly" == timegrain:
months = 3
dates = [get_period_ending(from_date, timegrain)]
while getdate(dates[-1]) < getdate(to_date):
date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
dates.append(date)
return dates

View File

@@ -0,0 +1,215 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import date_diff, add_months, today, getdate, add_days, flt, get_last_day
from erpnext.accounts.utils import get_account_currency
from frappe.email import sendmail_to_system_managers
def validate_service_stop_date(doc):
''' Validates service_stop_date for Purchase Invoice and Sales Invoice '''
enable_check = "enable_deferred_revenue" \
if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
old_stop_dates = {}
old_doc = frappe.db.get_all("{0} Item".format(doc.doctype),
{"parent": doc.name}, ["name", "service_stop_date"])
for d in old_doc:
old_stop_dates[d.name] = d.service_stop_date or ""
for item in doc.items:
if not item.get(enable_check): continue
if item.service_stop_date:
if date_diff(item.service_stop_date, item.service_start_date) < 0:
frappe.throw(_("Service Stop Date cannot be before Service Start Date"))
if date_diff(item.service_stop_date, item.service_end_date) > 0:
frappe.throw(_("Service Stop Date cannot be after Service End Date"))
if old_stop_dates and old_stop_dates.get(item.name) and item.service_stop_date!=old_stop_dates.get(item.name):
frappe.throw(_("Cannot change Service Stop Date for item in row {0}".format(item.idx)))
def convert_deferred_expense_to_expense(start_date=None, end_date=None):
# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
if not start_date:
start_date = add_months(today(), -1)
if not end_date:
end_date = add_days(today(), -1)
# check for the purchase invoice for which GL entries has to be done
invoices = frappe.db.sql_list('''
select distinct parent from `tabPurchase Invoice Item`
where service_start_date<=%s and service_end_date>=%s
and enable_deferred_expense = 1 and docstatus = 1 and ifnull(amount, 0) > 0
''', (end_date, start_date))
# For each invoice, book deferred expense
for invoice in invoices:
doc = frappe.get_doc("Purchase Invoice", invoice)
book_deferred_income_or_expense(doc, end_date)
def convert_deferred_revenue_to_income(start_date=None, end_date=None):
# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
if not start_date:
start_date = add_months(today(), -1)
if not end_date:
end_date = add_days(today(), -1)
# check for the sales invoice for which GL entries has to be done
invoices = frappe.db.sql_list('''
select distinct parent from `tabSales Invoice Item`
where service_start_date<=%s and service_end_date>=%s
and enable_deferred_revenue = 1 and docstatus = 1 and ifnull(amount, 0) > 0
''', (end_date, start_date))
for invoice in invoices:
doc = frappe.get_doc("Sales Invoice", invoice)
book_deferred_income_or_expense(doc, end_date)
def get_booking_dates(doc, item, posting_date=None):
if not posting_date:
posting_date = add_days(today(), -1)
last_gl_entry = False
deferred_account = "deferred_revenue_account" if doc.doctype=="Sales Invoice" else "deferred_expense_account"
prev_gl_entry = frappe.db.sql('''
select name, posting_date from `tabGL Entry` where company=%s and account=%s and
voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
order by posting_date desc limit 1
''', (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
if prev_gl_entry:
start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
else:
start_date = item.service_start_date
end_date = get_last_day(start_date)
if end_date >= item.service_end_date:
end_date = item.service_end_date
last_gl_entry = True
elif item.service_stop_date and end_date >= item.service_stop_date:
end_date = item.service_stop_date
last_gl_entry = True
if end_date > getdate(posting_date):
end_date = posting_date
if getdate(start_date) <= getdate(end_date):
return start_date, end_date, last_gl_entry
else:
return None, None, None
def calculate_amount(doc, item, last_gl_entry, total_days, total_booking_days, account_currency):
if doc.doctype == "Sales Invoice":
total_credit_debit, total_credit_debit_currency = "debit", "debit_in_account_currency"
deferred_account = "deferred_revenue_account"
else:
total_credit_debit, total_credit_debit_currency = "credit", "credit_in_account_currency"
deferred_account = "deferred_expense_account"
amount, base_amount = 0, 0
if not last_gl_entry:
base_amount = flt(item.base_net_amount*total_booking_days/flt(total_days), item.precision("base_net_amount"))
if account_currency==doc.company_currency:
amount = base_amount
else:
amount = flt(item.net_amount*total_booking_days/flt(total_days), item.precision("net_amount"))
else:
gl_entries_details = frappe.db.sql('''
select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
group by voucher_detail_no
'''.format(total_credit_debit, total_credit_debit_currency),
(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
already_booked_amount = gl_entries_details[0].total_credit if gl_entries_details else 0
base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
if account_currency==doc.company_currency:
amount = base_amount
else:
already_booked_amount_in_account_currency = gl_entries_details[0].total_credit_in_account_currency if gl_entries_details else 0
amount = flt(item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount"))
return amount, base_amount
def book_deferred_income_or_expense(doc, posting_date=None):
enable_check = "enable_deferred_revenue" \
if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
def _book_deferred_revenue_or_expense(item):
start_date, end_date, last_gl_entry = get_booking_dates(doc, item, posting_date=posting_date)
if not (start_date and end_date): return
account_currency = get_account_currency(item.expense_account)
if doc.doctype == "Sales Invoice":
against, project = doc.customer, doc.project
credit_account, debit_account = item.income_account, item.deferred_revenue_account
else:
against, project = doc.supplier, item.project
credit_account, debit_account = item.deferred_expense_account, item.expense_account
total_days = date_diff(item.service_end_date, item.service_start_date) + 1
total_booking_days = date_diff(end_date, start_date) + 1
amount, base_amount = calculate_amount(doc, item, last_gl_entry,
total_days, total_booking_days, account_currency)
make_gl_entries(doc, credit_account, debit_account, against,
amount, base_amount, end_date, project, account_currency, item.cost_center, item.name)
if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
_book_deferred_revenue_or_expense(item)
for item in doc.get('items'):
if item.get(enable_check):
_book_deferred_revenue_or_expense(item)
def make_gl_entries(doc, credit_account, debit_account, against,
amount, base_amount, posting_date, project, account_currency, cost_center, voucher_detail_no):
# GL Entry for crediting the amount in the deferred expense
from erpnext.accounts.general_ledger import make_gl_entries
if amount == 0: return
gl_entries = []
gl_entries.append(
doc.get_gl_dict({
"account": credit_account,
"against": against,
"credit": base_amount,
"credit_in_account_currency": amount,
"cost_center": cost_center,
"voucher_detail_no": voucher_detail_no,
'posting_date': posting_date,
'project': project
}, account_currency)
)
# GL Entry to debit the amount from the expense
gl_entries.append(
doc.get_gl_dict({
"account": debit_account,
"against": against,
"debit": base_amount,
"debit_in_account_currency": amount,
"cost_center": cost_center,
"voucher_detail_no": voucher_detail_no,
'posting_date': posting_date,
'project': project
}, account_currency)
)
if gl_entries:
try:
make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
frappe.db.commit()
except:
frappe.db.rollback()
title = _("Error while processing deferred accounting for {0}").format(doc.name)
traceback = frappe.get_traceback()
frappe.log_error(message=traceback , title=title)
sendmail_to_system_managers(title, traceback)

View File

@@ -17,18 +17,13 @@ frappe.ui.form.on('Account', {
});
},
refresh: function(frm) {
if (frm.doc.__islocal) {
frappe.msgprint(__("Please create new account from Chart of Accounts."));
throw "cannot create";
}
frm.toggle_display('account_name', frm.doc.__islocal);
frm.toggle_display('account_name', frm.is_new());
// hide fields if group
frm.toggle_display(['account_type', 'tax_rate'], cint(frm.doc.is_group) == 0);
// disable fields
frm.toggle_enable(['account_name', 'is_group', 'company'], false);
frm.toggle_enable(['is_group', 'company'], false);
if (cint(frm.doc.is_group) == 0) {
frm.toggle_display('freeze_account', frm.doc.__onload
@@ -36,16 +31,25 @@ frappe.ui.form.on('Account', {
}
// read-only for root accounts
if (!frm.doc.parent_account) {
frm.set_read_only();
frm.set_intro(__("This is a root account and cannot be edited."));
} else {
// credit days and type if customer or supplier
frm.set_intro(null);
frm.trigger('account_type');
// show / hide convert buttons
frm.trigger('add_toolbar_buttons');
if (!frm.is_new()) {
if (!frm.doc.parent_account) {
frm.set_read_only();
frm.set_intro(__("This is a root account and cannot be edited."));
} else {
// credit days and type if customer or supplier
frm.set_intro(null);
frm.trigger('account_type');
// show / hide convert buttons
frm.trigger('add_toolbar_buttons');
}
if (frm.has_perm('write')) {
frm.add_custom_button(__('Update Account Name / Number'), function () {
frm.trigger("update_account_number");
});
frm.add_custom_button(__('Merge Account'), function () {
frm.trigger("merge_account");
});
}
}
},
account_type: function (frm) {
@@ -68,7 +72,8 @@ frappe.ui.form.on('Account', {
}
});
});
} else if (cint(frm.doc.is_group) == 0) {
} else if (cint(frm.doc.is_group) == 0
&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
cur_frm.add_custom_button(__('Ledger'), function () {
frappe.route_options = {
"account": frm.doc.name,
@@ -89,6 +94,93 @@ frappe.ui.form.on('Account', {
});
});
}
},
merge_account: function(frm) {
var d = new frappe.ui.Dialog({
title: __('Merge with Existing Account'),
fields: [
{
"label" : "Name",
"fieldname": "name",
"fieldtype": "Data",
"reqd": 1,
"default": frm.doc.name
}
],
primary_action: function() {
var data = d.get_values();
frappe.call({
method: "erpnext.accounts.doctype.account.account.merge_account",
args: {
old: frm.doc.name,
new: data.name,
is_group: frm.doc.is_group,
root_type: frm.doc.root_type,
company: frm.doc.company
},
callback: function(r) {
if(!r.exc) {
if(r.message) {
frappe.set_route("Form", "Account", r.message);
}
d.hide();
}
}
});
},
primary_action_label: __('Merge')
});
d.show();
},
update_account_number: function(frm) {
var d = new frappe.ui.Dialog({
title: __('Update Account Number / Name'),
fields: [
{
"label": "Account Name",
"fieldname": "account_name",
"fieldtype": "Data",
"reqd": 1,
"default": frm.doc.account_name
},
{
"label": "Account Number",
"fieldname": "account_number",
"fieldtype": "Data",
"default": frm.doc.account_number
}
],
primary_action: function() {
var data = d.get_values();
if(data.account_number === frm.doc.account_number && data.account_name === frm.doc.account_name) {
d.hide();
return;
}
frappe.call({
method: "erpnext.accounts.doctype.account.account.update_account_number",
args: {
account_number: data.account_number,
account_name: data.account_name,
name: frm.doc.name
},
callback: function(r) {
if(!r.exc) {
if(r.message) {
frappe.set_route("Form", "Account", r.message);
} else {
frm.set_value("account_number", data.account_number);
frm.set_value("account_name", data.account_name);
}
d.hide();
}
}
});
},
primary_action_label: __('Update')
});
d.show();
}
});
});

View File

@@ -1,646 +1,259 @@
{
"allow_copy": 1,
"allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"beta": 0,
"creation": "2013-01-30 12:49:46",
"custom": 0,
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
"allow_copy": 1,
"allow_import": 1,
"creation": "2013-01-30 12:49:46",
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
"properties",
"column_break0",
"disabled",
"account_name",
"account_number",
"is_group",
"company",
"root_type",
"report_type",
"account_currency",
"inter_company_account",
"column_break1",
"parent_account",
"account_type",
"tax_rate",
"freeze_account",
"balance_must_be",
"lft",
"rgt",
"old_parent",
"include_in_gross"
],
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "properties",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "properties",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"width": "50%"
},
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "account_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Account Name",
"length": 0,
"no_copy": 1,
"oldfieldname": "account_name",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "account_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Account Name",
"no_copy": 1,
"oldfieldname": "account_name",
"oldfieldtype": "Data",
"reqd": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"fieldname": "is_group",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Is Group",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "account_number",
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Account Number",
"read_only": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
"oldfieldname": "company",
"oldfieldtype": "Link",
"options": "Company",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 1,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"default": "0",
"fieldname": "is_group",
"fieldtype": "Check",
"label": "Is Group"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "root_type",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Root Type",
"length": 0,
"no_copy": 0,
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "company",
"fieldtype": "Link",
"in_standard_filter": 1,
"label": "Company",
"oldfieldname": "company",
"oldfieldtype": "Link",
"options": "Company",
"read_only": 1,
"remember_last_selected_value": 1,
"reqd": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "report_type",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Report Type",
"length": 0,
"no_copy": 0,
"options": "\nBalance Sheet\nProfit and Loss",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "root_type",
"fieldtype": "Select",
"in_standard_filter": 1,
"label": "Root Type",
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
"read_only": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.is_group==0",
"fieldname": "account_currency",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
"options": "Currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "report_type",
"fieldtype": "Select",
"in_standard_filter": 1,
"label": "Report Type",
"options": "\nBalance Sheet\nProfit and Loss",
"read_only": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"depends_on": "eval:doc.is_group==0",
"fieldname": "account_currency",
"fieldtype": "Link",
"label": "Currency",
"options": "Currency"
},
{
"default": "0",
"fieldname": "inter_company_account",
"fieldtype": "Check",
"label": "Inter Company Account"
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"width": "50%"
},
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "parent_account",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 1,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Parent Account",
"length": 0,
"no_copy": 0,
"oldfieldname": "parent_account",
"oldfieldtype": "Link",
"options": "Account",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
"set_only_once": 0,
"unique": 0
},
"fieldname": "parent_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Parent Account",
"oldfieldname": "parent_account",
"oldfieldtype": "Link",
"options": "Account",
"reqd": 1,
"search_index": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Setting Account Type helps in selecting this Account in transactions.",
"fieldname": "account_type",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Account Type",
"length": 0,
"no_copy": 0,
"oldfieldname": "account_type",
"oldfieldtype": "Select",
"options": "\nAccumulated Depreciation\nBank\nCash\nChargeable\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"description": "Setting Account Type helps in selecting this Account in transactions.",
"fieldname": "account_type",
"fieldtype": "Select",
"in_standard_filter": 1,
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
"options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Rate at which this tax is applied",
"fieldname": "tax_rate",
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"description": "Rate at which this tax is applied",
"fieldname": "tax_rate",
"fieldtype": "Float",
"label": "Rate",
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "If the account is frozen, entries are allowed to restricted users.",
"fieldname": "freeze_account",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Frozen",
"length": 0,
"no_copy": 0,
"oldfieldname": "freeze_account",
"oldfieldtype": "Select",
"options": "No\nYes",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"description": "If the account is frozen, entries are allowed to restricted users.",
"fieldname": "freeze_account",
"fieldtype": "Select",
"label": "Frozen",
"oldfieldname": "freeze_account",
"oldfieldtype": "Select",
"options": "No\nYes"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "balance_must_be",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Balance must be",
"length": 0,
"no_copy": 0,
"options": "\nDebit\nCredit",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"fieldname": "balance_must_be",
"fieldtype": "Select",
"label": "Balance must be",
"options": "\nDebit\nCredit"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Lft",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
"set_only_once": 0,
"unique": 0
},
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
"label": "Lft",
"print_hide": 1,
"read_only": 1,
"search_index": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "rgt",
"fieldtype": "Int",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Rgt",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
"set_only_once": 0,
"unique": 0
},
"fieldname": "rgt",
"fieldtype": "Int",
"hidden": 1,
"label": "Rgt",
"print_hide": 1,
"read_only": 1,
"search_index": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "old_parent",
"fieldtype": "Data",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Old Parent",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
"fieldname": "old_parent",
"fieldtype": "Data",
"hidden": 1,
"label": "Old Parent",
"print_hide": 1,
"read_only": 1
},
{
"default": "0",
"depends_on": "eval:(doc.report_type == 'Profit and Loss' && !doc.is_group)",
"fieldname": "include_in_gross",
"fieldtype": "Check",
"label": "Include in gross"
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disable"
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-04-21 17:22:41.150984",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
"owner": "Administrator",
],
"icon": "fa fa-money",
"idx": 1,
"modified": "2019-10-10 19:10:02.967554",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"import": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"share": 1,
"write": 1
},
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Auditor",
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
"email": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Auditor"
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User",
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
"email": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User"
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Purchase User",
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
"email": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Purchase User"
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 1,
"share": 1,
"submit": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"import": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 1,
"share": 1,
"write": 1
}
],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"search_fields": "",
"show_name_in_global_search": 1,
"sort_order": "ASC",
"track_changes": 0,
"track_seen": 0
],
"search_fields": "account_number",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
"track_changes": 1
}

View File

@@ -3,15 +3,20 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint, fmt_money
from frappe.utils import cint, cstr
from frappe import throw, _
from frappe.model.document import Document
from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
class RootNotEditable(frappe.ValidationError): pass
class BalanceMismatchError(frappe.ValidationError): pass
class Account(Document):
class Account(NestedSet):
nsm_parent_field = 'parent_account'
def on_update(self):
if frappe.local.flags.ignore_on_update:
return
else:
super(Account, self).on_update()
def onload(self):
frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",
@@ -20,24 +25,23 @@ class Account(Document):
self.set_onload("can_freeze_account", True)
def autoname(self):
# first validate if company exists
company = frappe.db.get_value("Company", self.company, ["abbr", "name"], as_dict=True)
if not company:
frappe.throw(_('Company {0} does not exist').format(self.company))
self.name = self.account_name.strip() + ' - ' + company.abbr
from erpnext.accounts.utils import get_autoname_with_number
self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company)
def validate(self):
from erpnext.accounts.utils import validate_field_number
if frappe.local.flags.allow_unverified_charts:
return
self.validate_parent()
self.validate_root_details()
validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
self.validate_group_or_ledger()
self.set_root_and_report_type()
self.validate_mandatory()
self.validate_frozen_accounts_modifier()
self.validate_balance_must_be_debit_or_credit()
self.validate_account_currency()
self.validate_root_company_and_sync_account_to_children()
def validate_parent(self):
"""Fetch Parent Details and validate parent account"""
@@ -56,7 +60,8 @@ class Account(Document):
def set_root_and_report_type(self):
if self.parent_account:
par = frappe.db.get_value("Account", self.parent_account, ["report_type", "root_type"], as_dict=1)
par = frappe.db.get_value("Account", self.parent_account,
["report_type", "root_type"], as_dict=1)
if par.report_type:
self.report_type = par.report_type
@@ -86,6 +91,35 @@ class Account(Document):
if not self.parent_account and not self.is_group:
frappe.throw(_("Root Account must be a group"))
def validate_root_company_and_sync_account_to_children(self):
# ignore validation while creating new compnay or while syncing to child companies
if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
return
ancestors = get_root_company(self.company)
if ancestors:
if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
return
if not frappe.db.get_value("Account",
{'account_name': self.account_name, 'company': ancestors[0]}, 'name'):
frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
else:
descendants = get_descendants_of('Company', self.company)
if not descendants: return
parent_acc_name_map = {}
parent_acc_name, parent_acc_number = frappe.db.get_value('Account', self.parent_account, \
["account_name", "account_number"])
for d in frappe.db.get_values('Account',
{ "company": ["in", descendants], "account_name": parent_acc_name,
"account_number": parent_acc_number },
["company", "name"], as_dict=True):
parent_acc_name_map[d["company"]] = d["name"]
if not parent_acc_name_map: return
self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
def validate_group_or_ledger(self):
if self.get("__islocal"):
return
@@ -120,12 +154,55 @@ class Account(Document):
def validate_account_currency(self):
if not self.account_currency:
self.account_currency = frappe.db.get_value("Company", self.company, "default_currency")
self.account_currency = frappe.get_cached_value('Company', self.company, "default_currency")
elif self.account_currency != frappe.db.get_value("Account", self.name, "account_currency"):
if frappe.db.get_value("GL Entry", {"account": self.name}):
frappe.throw(_("Currency can not be changed after making entries using some other currency"))
def create_account_for_child_company(self, parent_acc_name_map, descendants, parent_acc_name):
for company in descendants:
if not parent_acc_name_map.get(company):
frappe.throw(_("While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA")
.format(company, parent_acc_name))
filters = {
"account_name": self.account_name,
"company": company
}
if self.account_number:
filters["account_number"] = self.account_number
child_account = frappe.db.get_value("Account", filters, 'name')
if not child_account:
doc = frappe.copy_doc(self)
doc.flags.ignore_root_company_validation = True
doc.update({
"company": company,
# parent account's currency should be passed down to child account's curreny
# if it is None, it picks it up from default company currency, which might be unintended
"account_currency": self.account_currency,
"parent_account": parent_acc_name_map[company]
})
doc.save()
frappe.msgprint(_("Account {0} is added in the child company {1}")
.format(doc.name, company))
elif child_account:
# update the parent company's value in child companies
doc = frappe.get_doc("Account", child_account)
parent_value_changed = False
for field in ['account_type', 'account_currency',
'freeze_account', 'balance_must_be']:
if doc.get(field) != self.get(field):
parent_value_changed = True
doc.set(field, self.get(field))
if parent_value_changed:
doc.save()
def convert_group_to_ledger(self):
if self.check_if_child_exists():
throw(_("Account with child nodes cannot be converted to ledger"))
@@ -161,56 +238,12 @@ class Account(Document):
if not self.report_type:
throw(_("Report Type is mandatory"))
def update_nsm_model(self):
"""update lft, rgt indices for nested set model"""
import frappe
import frappe.utils.nestedset
frappe.utils.nestedset.update_nsm(self)
def on_update(self):
self.update_nsm_model()
def validate_trash(self):
"""checks gl entries and if child exists"""
def on_trash(self):
# checks gl entries and if child exists
if self.check_gle_exists():
throw(_("Account with existing transaction can not be deleted"))
if self.check_if_child_exists():
throw(_("Child account exists for this account. You can not delete this account."))
def on_trash(self):
self.validate_trash()
self.update_nsm_model()
def before_rename(self, old, new, merge=False):
# Add company abbr if not provided
from erpnext.setup.doctype.company.company import get_name_with_abbr
new_account = get_name_with_abbr(new, self.company)
# Validate properties before merging
if merge:
if not frappe.db.exists("Account", new):
throw(_("Account {0} does not exist").format(new))
val = list(frappe.db.get_value("Account", new_account,
["is_group", "root_type", "company"]))
if val != [self.is_group, self.root_type, self.company]:
throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
frappe.db.set_value("Account", new, "parent_account",
frappe.db.get_value("Account", old, "parent_account"))
return new_account
def after_rename(self, old, new, merge=False):
if not merge:
frappe.db.set_value("Account", new, "account_name",
" - ".join(new.split(" - ")[:-1]))
else:
from frappe.utils.nestedset import rebuild_tree
rebuild_tree("Account", "parent_account")
super(Account, self).on_trash(True)
def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""select name from tabAccount
@@ -224,10 +257,75 @@ def get_account_currency(account):
if not account:
return
def generator():
account_currency, company = frappe.db.get_value("Account", account, ["account_currency", "company"])
account_currency, company = frappe.get_cached_value("Account", account, ["account_currency", "company"])
if not account_currency:
account_currency = frappe.db.get_value("Company", company, "default_currency")
account_currency = frappe.get_cached_value('Company', company, "default_currency")
return account_currency
return frappe.local_cache("account_currency", account, generator)
def on_doctype_update():
frappe.db.add_index("Account", ["lft", "rgt"])
def get_account_autoname(account_number, account_name, company):
# first validate if company exists
company = frappe.get_cached_value('Company', company, ["abbr", "name"], as_dict=True)
if not company:
frappe.throw(_('Company {0} does not exist').format(company))
parts = [account_name.strip(), company.abbr]
if cstr(account_number).strip():
parts.insert(0, cstr(account_number).strip())
return ' - '.join(parts)
def validate_account_number(name, account_number, company):
if account_number:
account_with_same_number = frappe.db.get_value("Account",
{"account_number": account_number, "company": company, "name": ["!=", name]})
if account_with_same_number:
frappe.throw(_("Account Number {0} already used in account {1}")
.format(account_number, account_with_same_number))
@frappe.whitelist()
def update_account_number(name, account_name, account_number=None):
account = frappe.db.get_value("Account", name, "company", as_dict=True)
if not account: return
validate_account_number(name, account_number, account.company)
if account_number:
frappe.db.set_value("Account", name, "account_number", account_number.strip())
else:
frappe.db.set_value("Account", name, "account_number", "")
frappe.db.set_value("Account", name, "account_name", account_name.strip())
new_name = get_account_autoname(account_number, account_name, account.company)
if name != new_name:
frappe.rename_doc("Account", name, new_name, force=1)
return new_name
@frappe.whitelist()
def merge_account(old, new, is_group, root_type, company):
# Validate properties before merging
if not frappe.db.exists("Account", new):
throw(_("Account {0} does not exist").format(new))
val = list(frappe.db.get_value("Account", new,
["is_group", "root_type", "company"]))
if val != [cint(is_group), root_type, company]:
throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
frappe.db.set_value("Account", new, "parent_account",
frappe.db.get_value("Account", old, "parent_account"))
frappe.rename_doc("Account", old, new, merge=1, force=1)
return new
@frappe.whitelist()
def get_root_company(company):
# return the topmost company in the hierarchy
ancestors = get_ancestors_of('Company', company, "lft asc")
return [ancestors[0]] if ancestors else []

View File

@@ -4,13 +4,42 @@ frappe.treeview_settings["Account"] = {
breadcrumbs: "Accounts",
title: __("Chart Of Accounts"),
get_tree_root: false,
filters: [{
fieldname: "company",
fieldtype:"Select",
options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
label: __("Company"),
default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
}],
filters: [
{
fieldname: "company",
fieldtype:"Select",
options: erpnext.utils.get_tree_options("company"),
label: __("Company"),
default: erpnext.utils.get_tree_default("company"),
on_change: function() {
var me = frappe.treeview_settings['Account'].treeview;
var company = me.page.fields_dict.company.get_value();
frappe.call({
method: "erpnext.accounts.doctype.account.account.get_root_company",
args: {
company: company,
},
callback: function(r) {
if(r.message) {
let root_company = r.message.length ? r.message[0] : "";
me.page.fields_dict.root_company.set_value(root_company);
frappe.db.get_value("Company", {"name": company}, "allow_account_creation_against_child_company", (r) => {
frappe.flags.ignore_root_company_validation = r.allow_account_creation_against_child_company;
});
}
}
});
}
},
{
fieldname: "root_company",
fieldtype:"Data",
label: __("Root Company"),
hidden: true,
disable_onchange: true
}
],
root_label: "Accounts",
get_tree_nodes: 'erpnext.accounts.utils.get_children',
add_tree_node: 'erpnext.accounts.utils.add_ac',
@@ -24,15 +53,15 @@ frappe.treeview_settings["Account"] = {
fields: [
{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
description: __("Number of new Account, it will be included in the account name as a prefix")},
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
description: __("Optional. This setting will be used to filter in various transactions.")
},
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
@@ -41,19 +70,88 @@ frappe.treeview_settings["Account"] = {
description: __("Optional. Sets company's default currency, if not specified.")}
],
ignore_fields:["parent_account"],
onload: function(treeview) {
frappe.treeview_settings['Account'].treeview = {};
$.extend(frappe.treeview_settings['Account'].treeview, treeview);
function get_company() {
return treeview.page.fields_dict.company.get_value();
}
// tools
treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
frappe.set_route('Tree', 'Cost Center', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(__("Journal Entry"), function() {
frappe.new_doc('Journal Entry', {company: get_company()});
}, __('Create'));
treeview.page.add_inner_button(__("New Company"), function() {
frappe.new_doc('Company');
}, __('Create'));
// financial statements
for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
treeview.page.add_inner_button(__(report), function() {
frappe.set_route('query-report', report, {company: get_company()});
}, __('Financial Statements'));
}
},
post_render: function(treeview) {
frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
treeview.page.set_primary_action(__("New"), function() {
let root_company = treeview.page.fields_dict.root_company.get_value();
if(root_company) {
frappe.throw(__("Please add the account to root level Company - ") + root_company);
} else {
treeview.new_node();
}
}, "octicon octicon-plus");
},
onrender: function(node) {
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
if (node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">'
+ (node.data.balance_in_account_currency ?
(format_currency(Math.abs(node.data.balance_in_account_currency),
node.data.account_currency) + " / ") : "")
+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+ " " + dr_or_cr
+ '</span>').insertBefore(node.$ul);
if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
// show Dr if positive since balance is calculated as debit - credit else show Cr
let balance = node.data.balance_in_account_currency || node.data.balance;
let dr_or_cr = balance > 0 ? "Dr": "Cr";
if (node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">'
+ (node.data.balance_in_account_currency ?
(format_currency(Math.abs(node.data.balance_in_account_currency),
node.data.account_currency) + " / ") : "")
+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+ " " + dr_or_cr
+ '</span>').insertBefore(node.$ul);
}
}
},
toolbar: [
{
label:__("Add Child"),
condition: function(node) {
return frappe.boot.user.can_create.indexOf("Account") !== -1
&& (!frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value()
|| frappe.flags.ignore_root_company_validation)
&& node.expandable && !node.hide_add;
},
click: function() {
var me = frappe.treeview_settings['Account'].treeview;
me.new_node();
},
btnClass: "hidden-xs"
},
{
condition: function(node) {
return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
@@ -64,7 +162,7 @@ frappe.treeview_settings["Account"] = {
"account": node.label,
"from_date": frappe.sys_defaults.year_start_date,
"to_date": frappe.sys_defaults.year_end_date,
"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
};
frappe.set_route("query-report", "General Ledger");
},

View File

@@ -1,27 +1,30 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe, os, json
from frappe.utils import cstr
from unidecode import unidecode
from six import iteritems
from frappe.utils.nestedset import rebuild_tree
def create_charts(company, chart_template=None, existing_company=None):
chart = get_chart(chart_template, existing_company)
def create_charts(company, chart_template=None, existing_company=None, custom_chart=None):
chart = custom_chart or get_chart(chart_template, existing_company)
if chart:
accounts = []
def _import_accounts(children, parent, root_type, root_account=False):
for account_name, child in children.items():
for account_name, child in iteritems(children):
if root_account:
root_type = child.get("root_type")
if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
if account_name not in ["account_number", "account_type",
"root_type", "is_group", "tax_rate"]:
account_name_in_db = unidecode(account_name.strip().lower())
if account_name_in_db in accounts:
count = accounts.count(account_name_in_db)
account_name = account_name + " " + cstr(count)
account_number = cstr(child.get("account_number")).strip()
account_name, account_name_in_db = add_suffix_if_duplicate(account_name,
account_number, accounts)
is_group = identify_is_group(child)
report_type = "Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] \
@@ -35,28 +38,47 @@ def create_charts(company, chart_template=None, existing_company=None):
"is_group": is_group,
"root_type": root_type,
"report_type": report_type,
"account_number": account_number,
"account_type": child.get("account_type"),
"account_currency": frappe.db.get_value("Company", company, "default_currency"),
"account_currency": child.get('account_currency') or frappe.db.get_value('Company', company, "default_currency"),
"tax_rate": child.get("tax_rate")
})
if root_account or frappe.local.flags.allow_unverified_charts:
account.flags.ignore_mandatory = True
account.flags.ignore_permissions = True
account.insert()
accounts.append(account_name_in_db)
_import_accounts(child, account.name, root_type)
# Rebuild NestedSet HSM tree for Account Doctype
# after all accounts are already inserted.
frappe.local.flags.ignore_on_update = True
_import_accounts(chart, None, None, root_account=True)
rebuild_tree("Account", "parent_account")
frappe.local.flags.ignore_on_update = False
def add_suffix_if_duplicate(account_name, account_number, accounts):
if account_number:
account_name_in_db = unidecode(" - ".join([account_number,
account_name.strip().lower()]))
else:
account_name_in_db = unidecode(account_name.strip().lower())
if account_name_in_db in accounts:
count = accounts.count(account_name_in_db)
account_name = account_name + " " + cstr(count)
return account_name, account_name_in_db
def identify_is_group(child):
if child.get("is_group"):
is_group = child.get("is_group")
elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate", "account_number"])):
is_group = 1
else:
is_group = 0
@@ -67,10 +89,14 @@ def get_chart(chart_template, existing_company=None):
chart = {}
if existing_company:
return get_account_tree_from_existing_company(existing_company)
elif chart_template == "Standard":
from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
return standard_chart_of_accounts.get()
elif chart_template == "Standard with Numbers":
from erpnext.accounts.doctype.account.chart_of_accounts.verified \
import standard_chart_of_accounts_with_account_number
return standard_chart_of_accounts_with_account_number.get()
else:
folders = ("verified",)
if frappe.local.flags.allow_unverified_charts:
@@ -78,6 +104,7 @@ def get_chart(chart_template, existing_company=None):
for folder in folders:
path = os.path.join(os.path.dirname(__file__), folder)
for fname in os.listdir(path):
fname = frappe.as_unicode(fname)
if fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
chart = f.read()
@@ -85,7 +112,7 @@ def get_chart(chart_template, existing_company=None):
return json.loads(chart).get("tree")
@frappe.whitelist()
def get_charts_for_country(country):
def get_charts_for_country(country, with_standard=False):
charts = []
def _get_chart_name(content):
@@ -103,57 +130,105 @@ def get_charts_for_country(country):
for folder in folders:
path = os.path.join(os.path.dirname(__file__), folder)
if not os.path.exists(path):
continue
for fname in os.listdir(path):
fname = frappe.as_unicode(fname)
if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
_get_chart_name(f.read())
if len(charts) != 1:
charts.append("Standard")
# if more than one charts, returned then add the standard
if len(charts) != 1 or with_standard:
charts += ["Standard", "Standard with Numbers"]
return charts
def get_account_tree_from_existing_company(existing_company):
all_accounts = frappe.get_all('Account',
filters={'company': existing_company},
fields = ["name", "account_name", "parent_account", "account_type",
"is_group", "root_type", "tax_rate"],
all_accounts = frappe.get_all('Account',
filters={'company': existing_company},
fields = ["name", "account_name", "parent_account", "account_type",
"is_group", "root_type", "tax_rate", "account_number"],
order_by="lft, rgt")
account_tree = {}
# fill in tree starting with root accounts (those with no parent)
if all_accounts:
build_account_tree(account_tree, None, all_accounts)
return account_tree
def build_account_tree(tree, parent, all_accounts):
# find children
parent_account = parent.name if parent else ""
children = [acc for acc in all_accounts if cstr(acc.parent_account) == parent_account]
# if no children, but a group account
if not children and parent.is_group:
tree["is_group"] = 1
tree["account_number"] = parent.account_number
# build a subtree for each child
for child in children:
if child.account_type == "Stock" and not child.is_group:
tree["is_group"] = 1
continue
# start new subtree
tree[child.account_name] = {}
# assign account_type and root_type
if child.account_number:
tree[child.account_name]["account_number"] = child.account_number
if child.account_type:
tree[child.account_name]["account_type"] = child.account_type
if child.tax_rate:
tree[child.account_name]["tax_rate"] = child.tax_rate
if not parent:
tree[child.account_name]["root_type"] = child.root_type
# call recursively to build a subtree for current account
build_account_tree(tree[child.account_name], child, all_accounts)
build_account_tree(tree[child.account_name], child, all_accounts)
@frappe.whitelist()
def validate_bank_account(coa, bank_account):
accounts = []
chart = get_chart(coa)
if chart:
def _get_account_names(account_master):
for account_name, child in iteritems(account_master):
if account_name not in ["account_number", "account_type",
"root_type", "is_group", "tax_rate"]:
accounts.append(account_name)
_get_account_names(child)
_get_account_names(chart)
return (bank_account in accounts)
@frappe.whitelist()
def build_tree_from_json(chart_template, chart_data=None):
''' get chart template from its folder and parse the json to be rendered as tree '''
chart = chart_data or get_chart(chart_template)
# if no template selected, return as it is
if not chart:
return
accounts = []
def _import_accounts(children, parent):
''' recursively called to form a parent-child based list of dict from chart template '''
for account_name, child in iteritems(children):
account = {}
if account_name in ["account_number", "account_type",\
"root_type", "is_group", "tax_rate"]: continue
account['parent_account'] = parent
account['expandable'] = True if identify_is_group(child) else False
account['value'] = (child.get('account_number') + ' - ' + account_name) \
if child.get('account_number') else account_name
accounts.append(account)
_import_accounts(child, account['value'])
_import_accounts(chart, None)
return accounts

View File

@@ -4,7 +4,7 @@
"""
Import chart of accounts from OpenERP sources
"""
from __future__ import unicode_literals
from __future__ import print_function, unicode_literals
import os, json
import ast
@@ -12,6 +12,8 @@ from xml.etree import ElementTree as ET
from frappe.utils.csvutils import read_csv_content
import frappe
from six import iteritems
path = "/Users/nabinhait/projects/odoo/addons"
accounts = {}
@@ -84,7 +86,7 @@ def get_csv_contents(files_path):
try:
csv_content.setdefault(file_type, [])\
.append(read_csv_content(csvfile.read()))
except Exception, e:
except Exception as e:
continue
return csv_content
@@ -137,7 +139,7 @@ def get_account_types(root_list, csv_content, prefix=None):
def make_maps_for_xml(xml_roots, account_types, country_dir):
"""make maps for `charts` and `accounts`"""
for model, root_list in xml_roots.iteritems():
for model, root_list in iteritems(xml_roots):
for root in root_list:
for node in root[0].findall("record"):
if node.get("model")=="account.account.template":
@@ -229,7 +231,7 @@ def make_charts():
filename = src["id"][5:] + "_" + chart_id
print "building " + filename
print("building " + filename)
chart = {}
chart["name"] = src["name"]
chart["country_code"] = src["id"][5:]

View File

@@ -1,209 +0,0 @@
{
"country_code": "ar",
"name": "Argentina - Plan de Cuentas",
"tree": {
"Cuentas Patrimoniales": {
"ACTIVO": {
"Bienes Inmateriales": {
"Bienes Inmateriales / (-) Amortizaci\u00f3n Acumulada": {},
"Bienes Inmateriales / Concesiones y Franquicias": {},
"Bienes Inmateriales / Marcas de F\u00e1brica": {},
"Bienes Inmateriales / Patentes de Invenci\u00f3n": {}
},
"Bienes de Cambio": {
"(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Bienes de Cambio": {},
"Bienes de Cambio - Mercader\u00edas": {
"Bienes de Cambio - Mercader\u00edas / Categoria de productos 01": {}
},
"Bienes de Cambio - Mercader\u00edas en Tr\u00e1nsito": {},
"Materiales Varios ": {},
"Materias primas": {},
"Productos Elaborados": {},
"Productos en Curso de Elaboraci\u00f3n": {}
},
"Bienes de Uso": {
"Bienes de Uso / (-) Depreciaci\u00f3n Acumulada": {},
"Bienes de Uso / Equipos": {},
"Bienes de Uso / Inmuebles": {},
"Bienes de Uso / Maquinaria": {},
"Bienes de Uso / Rodados": {}
},
"Caja y Bancos": {
"Caja y Bancos - Caja": {
"Caja y bancos - Caja / efectivo ARS": {}
},
"Caja y Bancos - Cuentas Corrientes": {
"Caja y Bancos.../ BCO. CTA CTE ARS": {}
},
"Caja y Bancos - Fondos fijos": {
"Caja y ...- Fondos fijos / caja chica 01 ARS": {}
},
"Caja y Bancos - Moneda Extranjera": {
"Caja y bancos - Caja / efectivo USD": {}
},
"Caja y bancos - Recaudaciones a Depositar ": {},
"Caja y bancos - Valores a Depositar ": {}
},
"Inversiones": {
"Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones": {},
"Inversiones / Acciones Permanentes": {},
"Inversiones / Acciones Transitorias": {},
"Inversiones / T\u00edtulos P\u00fablicos": {}
}
},
"Cr\u00e9ditos por Ventas": {
"Cr\u00e9ditos por Ventas / (-) Previsi\u00f3n para Ds. Incobrables": {},
"Cr\u00e9ditos por Ventas / Deudores Morosos": {},
"Cr\u00e9ditos por Ventas / Deudores Varios": {},
"Cr\u00e9ditos por Ventas / Deudores en Gesti\u00f3n Judicial": {},
"Cr\u00e9ditos por Ventas / Deudores por Ventas": {}
},
"Otros Cr\u00e9ditos": {
"Otros Cr\u00e9ditos / (-) Intereses (+) a Devengar": {},
"Otros Cr\u00e9ditos / (-) Previsi\u00f3n para Descuentos": {},
"Otros Cr\u00e9ditos / Accionistas": {},
"Otros Cr\u00e9ditos / Alquileres Pagados por Adelantado": {},
"Otros Cr\u00e9ditos / Anticipo al Personal": {},
"Otros Cr\u00e9ditos / Anticipo de Impuestos": {},
"Otros Cr\u00e9ditos / Anticipos a Proveedores": {},
"Otros Cr\u00e9ditos / Intereses Pagados por Adelantado": {},
"Otros Cr\u00e9ditos / Pr\u00e9stamos otorgados": {}
},
"PASIVO": {
"Deudas Bancarias y Financieras": {
"Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente": {},
"Deudas Bancarias y Financieras / Debentures Emitidos": {},
"Deudas Bancarias y Financieras / Intereses a Pagar": {},
"Deudas Bancarias y Financieras / Obligaciones a Pagar": {},
"Deudas Bancarias y Financieras / Prestamos": {}
},
"Deudas Comerciales": {
"Deudas Comerciales / (-) Intereses a Devengar por Compras al Cr\u00e9dito": {},
"Deudas Comerciales / Anticipos de Clientes": {},
"Deudas Comerciales / Proveedores": {}
},
"Deudas Fiscales": {
"Deudas Fiscales / IVA a Pagar": {},
"Deudas Fiscales / Impuesto a la Ganancia M\u00ednima Presunta a Pagar": {},
"Deudas Fiscales / Impuesto a las Ganancias a Pagar": {},
"Deudas Fiscales / Impuesto a los D\u00e9bitos y Cr\u00e9ditos Bancarios a Pagar": {},
"Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar": {},
"Deudas Fiscales / Monotributo a Pagar": {}
},
"Deudas Sociales": {
"Deudas Sociales / Cargas Sociales a Pagar": {},
"Deudas Sociales / Provisi\u00f3n para Sueldo Anual Complementario": {},
"Deudas Sociales / Retenciones a Depositar": {},
"Deudas Sociales / Sueldos a Pagar": {}
},
"Otras Deudas": {
"Otras Deudas / Acreedores Varios": {},
"Otras Deudas / Cobros por Adelantado": {},
"Otras Deudas / Dividendos a Pagar": {},
"Otras Deudas / Honorarios Directores y S\u00edndicos a Pagar": {}
},
"Previsiones": {
"Previsiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos": {},
"Previsiones / Previsi\u00f3n para Garant\u00edas por Service": {},
"Previsiones / Previsi\u00f3n para juicios Pendientes": {}
}
},
"PATRIMONIO NETO": {
"Ajustes al Patrimonio": {
"Ajustes al Patrimonio / Revaluo T\u00e9cnico de Bienes de Uso": {}
},
"Aportes No Capitalizados": {
"Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones": {},
"Aportes No Capitalizados / Primas de Emsi\u00f3n": {}
},
"Capital Social": {
"Capital social / (-) Descuento de Emisi\u00f3n de Acciones": {},
"Capital social / Acciones en Circulaci\u00f3n": {},
"Capital social / Capital Suscripto": {},
"Capital social / Dividendos a Distribuir en Acciones": {}
},
"Ganancias Reservadas": {
"Reserva Estatutaria": {},
"Reserva Facultativa": {},
"Reserva Legal": {},
"Reserva para Renovaci\u00f3n de Bienes de Uso": {}
},
"Resultados No Asignados": {
"Ganancias y P\u00e9rdidas del Ejercicio": {},
"Resultado del Ejercicio": {},
"Resultados Acumulados": {},
"Resultados Acumulados del Ejercicio Anterior": {}
}
},
"root_type": ""
},
"Cuentas de Movimiento": {
"Compras": {
"Compras - Categoria de productos 01": {}
},
"Costos de Producci\u00f3n": {},
"Gastos de Administraci\u00f3n": {},
"Gastos de Comercializaci\u00f3n": {},
"root_type": ""
},
"Cuentas de Orden": {
"CUENTAS DE ORDEN ACREEDORAS": {
"Acreedor por Documentos Descontados": {},
"Acreedor por Garant\u00edas Otorgadas": {},
"Comitente por Mercaderias Recibidas en Consignaci\u00f3n": {}
},
"CUENTAS DE ORDEN DEUDORAS": {
"Dep\u00f3sito de Valores Recibos en Garant\u00eda": {},
"Documentos Descontados": {},
"Documentos Endosados": {},
"Garantias Otorgadas": {},
"Mercaderias Recibidas en Consignaci\u00f3n": {}
},
"root_type": ""
},
"Cuentas de Resultado": {
"RESULTADOS NEGATIVOS": {
"Resultados Negativos Extraordinarios": {
"Donaciones Cedidas, Otorgadas": {},
"Gastos en Siniestros": {},
"P\u00e9rdida Venta Bienes de Uso": {}
},
"Resultados Negativos Ordinarios": {
"Costo de Mercader\u00edas Vendidas": {
"Costo de Mercader\u00edas Vendidas - Categoria de productos 01": {}
},
"Gastos Bancarios": {},
"Gastos de Publicidad y Propaganda": {},
"Gastos en Amortizaci\u00f3n": {},
"Gastos en Cargas Sociales": {},
"Gastos en Depreciaci\u00f3n de Bienes de Uso": {},
"Gastos en Impuestos": {},
"Gastos en Servicios P\u00fablicos": {},
"Gastos en Sueldos y Jormales": {}
}
},
"RESULTADOS POSITIVOS": {
"Resultados Positivos Extraordinarios": {
"Donaciones obtenidas, ganandas, percibidas": {},
"Ganancia Venta Inversiones Permanentes": {},
"Ganancia Venta de Bienes de Uso": {},
"Recupero de Deudores Incobrables": {},
"Recupero de Rezagos": {}
},
"Resultados Positivos Ordinarios": {
"Alquileres gananados, obtenidos, percibidos": {},
"Comisiones gananados, obtenidos, percibidos": {},
"Descuentos gananados, obtenidos, percibidos": {},
"Ganancia Venta de Acciones": {},
"Honorarios gananados, obtenidos, percibidos": {},
"Intereses gananados, obtenidos, percibidos": {},
"Renta de T\u00edtulos P\u00fablicos": {},
"Resultados Positivos Ordinarios": {
"Ventas - Categoria de productos 01": {}
}
}
},
"root_type": ""
}
}
}

View File

@@ -1,172 +0,0 @@
{
"country_code": "ca",
"name": "Canada - Chart of Accounts for english-speaking provinces",
"tree": {
"ASSETS": {
"CURRENT ASSETS": {
"ACCOUNTS RECEIVABLES": {
"ALLOWANCE FOR DOUBTFUL ACCOUNTS": {},
"Customers Account": {
"account_type": "Receivable"
}
},
"CASH": {},
"CERTIFICATES OF DEPOSITS": {},
"INVESTMENTS HELD FOR TRADING": {},
"PREPAID EXPENSES": {},
"STOCKS": {
"Stock Delivered But Not Billed": {},
"Stock In Hand": {}
},
"TAXES RECEIVABLES": {
"GST receivable": {
"account_type": "Receivable"
},
"HST receivable": {
"HST receivable - 13%": {
"account_type": "Receivable"
},
"HST receivable - 14%": {
"account_type": "Receivable"
},
"HST receivable - 15%": {
"account_type": "Receivable"
}
},
"PST/QST receivable": {
"account_type": "Receivable"
}
},
"TREASURY OR TREASURY EQUIVALENTS": {}
},
"NON-CURRENT ASSETS": {
"INTANGIBLE ASSETS": {
"PATENTS, TRADEMARKS AND COPYRIGHTS": {}
},
"INVESTMENTS AVAILABLE FOR SALE": {},
"TANGIBLE ASSETS": {
"ACCUMULATED DEPRECIATIONS": {}
}
},
"root_type": "Asset"
},
"EQUITY": {
"CONTRIBUTED SURPLUS": {},
"DIVIDENDS": {},
"PREMIUMS": {},
"RETAINED EARNINGS": {},
"SHARE CAPITAL": {},
"TRANSLATION ADJUSTMENTS": {},
"root_type": "Equity"
},
"EXPENSES": {
"NON-OPERATING EXPENSES": {
"INTERESTS EXPENSES": {},
"OTHER NON-OPERATING EXPENSES": {}
},
"OPERATING EXPENSES": {
"COST OF GOODS SOLD": {
"Inside Purchases": {},
"International Purchases": {},
"Purchases in harmonized provinces": {},
"Purchases in non-harmonized provinces": {}
},
"GENERAL EXPENSES": {},
"LABOUR EXPENSES": {
"Annuities": {},
"Employment Insurance": {},
"Federal Income Tax": {},
"Health Services Fund": {},
"Holidays": {},
"Labour Health and Safety": {},
"Labour Standards": {},
"Parental Insurance": {},
"Provincial Income Tax": {},
"Salaries, wages and commissions": {}
},
"OTHER OPERATING EXPENSES": {},
"RESEARCH AND DEVELOPMENT EXPENSES": {},
"SALES EXPENSES": {}
},
"root_type": "Expense"
},
"INCOMES": {
"NON-OPERATING INCOMES": {
"INTERESTS": {},
"OTHER NON-OPERATING INCOMES": {}
},
"OPERATING INCOMES": {
"Harmonized Provinces Sales": {},
"Inside Sales": {},
"International Sales": {},
"Non-Harmonized Provinces Sales": {},
"OTHER OPERATING INCOMES": {}
},
"root_type": "Income"
},
"LIABILITIES": {
"CURRENT LIABILITIES": {
"ACCOUNTS PAYABLES": {
"Suppliers Account": {
"account_type": "Payable"
}
},
"CURRENT FINANCIAL DEBTS": {},
"LABOUR TAXES TO PAY": {
"CANADIAN REVENU AGENCY": {
"EMPLOYMENT INSURANCE TO PAY": {
"EI - Employees Contribution": {},
"EI - Employer Contribution": {}
},
"Federal Income Tax": {}
},
"PROVINCIAL REVENU AGENCY": {
"ANNUITIES TO PAY": {
"Annuities - Employees Contribution": {},
"Annuities - Employer Contribution": {}
},
"Health Services Fund to pay": {},
"Labour Health and Safety to pay": {},
"Labour Standards to pay": {},
"PARENTAL INSURANCE PLAN TO PAY": {
"PAP - Employee Contribution": {},
"PAP - Employer Contribution": {}
},
"Provincial Income Tax": {}
}
},
"LIABILITIES ASSETS HELD FOR TRANSFER": {
"Stock Received But Not Billed": {}
},
"OTHER ACCOUNTS PAYABLES": {},
"STOCK LIABILITIES": {},
"TAXES PAYABLES": {
"GST to pay": {
"account_type": "Payable"
},
"HST to pay": {
"HST to pay - 13%": {
"account_type": "Payable"
},
"HST to pay - 14%": {
"account_type": "Payable"
},
"HST to pay - 15%": {
"account_type": "Payable"
}
},
"PST/QST to pay": {
"account_type": "Payable"
}
}
},
"NON-CURRENT LIABILITIES": {
"DEFERRED TAXES": {},
"NON-CURRENT FINANCIAL DEBTS": {},
"OTHER NON-CURRENT LIABILITIES": {},
"PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES": {}
},
"root_type": "Liability"
}
}
}

View File

@@ -1,355 +0,0 @@
{
"country_code": "hu",
"name": "Hungary - Magyar f\u0151k\u00f6nyvi kivonat",
"tree": {
"Eredm\u00e9ny sz\u00e1ml\u00e1k": {
"AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE, BEV\u00c9TELEK": {
"BELF\u00d6LDI \u00c9RK\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
"Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
},
"BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
"Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
},
"EGY\u00c9B BEV\u00c9TELEK": {
"Az \u00fczleti \u00e9vhez kapcs. egy\u00e9b bev\u00e9telek": {},
"Biztos\u00edt\u00f3 \u00e1ltal visszaig. k\u00e1rt\u00e9r\u00edt\u00e9s \u00f6.": {},
"C\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa": {},
"K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {},
"Ut\u00f3lag kapott p\u00fc. rendezett engedm\u00e9ny": {},
"Visszafiz. k\u00f6t. n\u00e9lk\u00fcl kapott t\u00e1mogat\u00e1s": {},
"\u00c9rt,\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek elism.m\u00e9rt\u00e9ke": {},
"\u00c9rt.immat. javak, t\u00e1rgyi eszk.bev\u00e9tele": {},
"\u00c9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa, tervenf.\u00e9cs.": {}
},
"EXPORT \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
"Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev. EU tagorsz\u00e1gba": {},
"Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev.nem EU tagorsz.": {}
},
"P\u00c9NZ\u00dcGYI M\u00dcVELETEK BEV\u00c9TELEI": {
"Befekt. p\u00fci.eszk. kamatai, \u00e1rf.nyeres.": {},
"Egy\u00e9b kapott kamatok,kamatjell.bev\u00e9telek": {},
"Egy\u00e9b p\u00e9nz\u00fcgyi m\u00fbveletek bev\u00e9telei": {},
"Egy\u00e9b \u00e1rfolyamnyeres\u00e9gek, opci\u00f3s bev.": {},
"Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rfolyamnyeres\u00e9ge": {},
"Kapott (j\u00e1r\u00f3) osztal\u00e9k, r\u00e9szesed\u00e9s": {},
"R\u00e9szesed\u00e9sek \u00e9rt. \u00e1rfolyamnyeres\u00e9ge": {},
"V\u00e1s. k\u00f6vetel\u00e9sekkel kapcs. bev\u00e9telek": {},
"\u00c1tv\u00e1lt\u00e1si, \u00e1t\u00e9rt\u00e9kel\u00e9skori \u00e1rf.nyeres\u00e9g": {}
},
"RENDKIV\u00dcLI BEV\u00c9TELEK": {
"Rendk\u00edv\u00fcli bev\u00e9telek": {}
}
},
"AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00d6NK\u00d6LTS. \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
"ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
"Anyagk\u00f6lts\u00e9g": {},
"Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {},
"Eladott (k\u00f6zvet\u00edtett) szolg. \u00e9rt\u00e9ke": {},
"Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {},
"Ig\u00e9nybevett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
},
"EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
"Ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"Az \u00fczleti \u00e9vhez kapcs. r\u00e1ford\u00edt\u00e1sok": {},
"C\u00e9ltartal\u00e9k k\u00e9pz\u00e9se": {},
"Elsz\u00e1molt \u00e9rt\u00e9kveszt\u00e9s, tervenf. \u00e9rt\u00e9kcs": {},
"K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {},
"Ut\u00f3lag adott p\u00fc. rendezett engedm\u00e9ny": {},
"\u00c9rt.\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek k\u00f6nyvsz. \u00e9rt.": {},
"\u00c9rt\u00e9kes\u00edtett eszk.imm.javak nytsz \u00e9rt\u00e9ke": {}
},
"NYERES\u00c9GET TERHEL\u00d6 AD\u00d3K": {
"Egyszer\u00fcs\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3": {},
"T\u00e1rsas v\u00e1llalkoz\u00e1s k\u00fcl\u00f6nad\u00f3ja": {},
"T\u00e1rsas\u00e1gi ad\u00f3": {}
},
"P\u00c9NZ\u00dcGYI M\u00dcVELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
"Befektetett p\u00fci. eszk. \u00e1rf.vesztes\u00e9ge": {},
"Egy\u00e9b p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {},
"Egy\u00e9b \u00e1rfolyamvesztes\u00e9gek, opci\u00f3s d\u00edjak": {},
"Fizetend\u00f5 kamatok, kamatjell. r\u00e1ford.": {},
"Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rf.vesztes\u00e9ge": {},
"R\u00e9szesed\u00e9sek,\u00e9.pap\u00edrok,bankb. \u00e9rt\u00e9kveszt": {},
"V\u00e1s\u00e1rolt k\u00f6v. kapcs. r\u00e1ford\u00edt\u00e1sok": {},
"\u00c1tv\u00e1lt\u00e1si, \u00e9rt\u00e9kel\u00e9si \u00e1rfolyamvesztes\u00e9g": {}
},
"RENDKIV\u00dcLI R\u00c1FORD\u00cdT\u00c1SOK": {
"Egy\u00e9b vagyoncs\u00f6kk. rendk\u00edv\u00fcli r\u00e1ford\u00edt\u00e1s": {},
"Saj\u00e1t \u00fczletr\u00e9sz nyilv\u00e1ntart\u00e1si \u00e9rt\u00e9ke": {},
"Tartoz\u00e1s\u00e1tv. szerz. szerinti \u00f6sszege": {},
"T\u00e1rsas\u00e1gban bevitt eszk. nytsz. \u00e9rt\u00e9ke": {}
},
"SZEM\u00c9LYI JELLEG\u00fb R\u00c1FORD\u00cdT\u00c1SOK": {
"B\u00e9rj\u00e1rul\u00e9kok": {},
"B\u00e9rk\u00f6lts\u00e9g": {},
"Szem\u00e9lyi jelleg\u00fc egy\u00e9b kifizet\u00e9sek": {}
},
"\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {}
},
"K\u00d6LTS\u00c9GNEMEK": {
"AKT\u00cdV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
"Saj\u00e1t el\u00f5\u00e1ll\u00edt\u00e1si eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt.": {},
"Saj\u00e1t term. k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa": {}
},
"ANYAGK\u00d6LTS\u00c9G": {
"Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {},
"Egy \u00e9ven bel\u00fcl elhaszn. anyagi eszk\u00f6z\u00f6k": {},
"Egy\u00e9b anyagk\u00f6lts\u00e9g": {},
"V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei": {}
},
"B\u00c9RJ\u00c1RUL\u00c9KOK": {
"Egyszer\u00fbs\u00edtett fogl. k\u00f6zteher": {},
"Egyszer\u00fbs\u00edtett k\u00f6ztehervisel\u00e9si hj\u00e1r": {},
"Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s": {},
"K\u00f6zteherjegy": {},
"Munkaad\u00f3i j\u00e1rul\u00e9k": {},
"Rehabilit\u00e1ci\u00f3s hozz\u00e1j\u00e1rul\u00e1s": {},
"Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {},
"T\u00e1rsadalombiztos\u00edt\u00e1si j\u00e1rul\u00e9k": {}
},
"B\u00c9RK\u00d6LTS\u00c9G": {
"Egyszer\u00fbs\u00edtett fogl. b\u00e9rk\u00f6lts\u00e9ge": {},
"Megb\u00edz\u00e1si d\u00edjak b\u00e9rk\u00f6lts\u00e9g terh\u00e9re": {},
"Munkav\u00e1llal\u00f3k munkab\u00e9r k\u00f6lts\u00e9ge": {},
"Tagok szem\u00e9lyes k\u00f6zr. ellen\u00e9rt\u00e9ke": {}
},
"EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
"Biztos\u00edt\u00e1si d\u00edjak": {},
"Hat\u00f3s\u00e1gi igazgat\u00e1si d\u00edjak (illet\u00e9kek)": {},
"P\u00e9nz\u00fcgyi szolg-i d\u00edjak, bankk\u00f6lts\u00e9gek": {}
},
"IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
"B\u00e9rleti d\u00edjak": {},
"Egy\u00e9b ig\u00e9nybevett szolg\u00e1ltat\u00e1sok ktg-ei": {},
"Hirdet\u00e9s, rekl\u00e1m-propaganda k\u00f6lts\u00e9g": {},
"Jav\u00edt\u00e1si, karbantart\u00e1si k\u00f6lts\u00e9gek": {},
"Oktat\u00e1si, tov\u00e1bbk\u00e9pz\u00e9si k\u00f6lts\u00e9gek": {},
"Postai, t\u00e1vk\u00f6zl\u00e9si k\u00f6lts\u00e9gek": {},
"Szakk\u00f6nyv, foly\u00f3irat, napilap beszerz\u00e9s": {},
"Sz\u00e1ll\u00edt\u00e1si, rakod\u00e1si k\u00f6lts\u00e9g": {},
"Utaz\u00e1si- \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek": {}
},
"K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
"Anyagk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {},
"B\u00e9rj\u00e1rul\u00e9kok \u00e1tvezet\u00e9si szla": {},
"B\u00e9rk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {},
"Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e1tvezet\u00e9si szla": {},
"Ig\u00e9nybevett szolg. \u00e1tvezet\u00e9si szla": {},
"Szem\u00e9lyi jell. kif. \u00e1tvezet\u00e9si szla": {},
"\u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s \u00e1tvez. szla": {}
},
"SZEM\u00c9LYI JELLEG\u00fb EGY\u00c9B KIFIZET\u00c9SEK": {
"Egy\u00e9b szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {},
"Foglalkoztat\u00f3t terhel\u00f5 t\u00e1pp\u00e9nz hj\u00e1rul\u00e1s": {},
"J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {},
"Kifizet\u00f5t terhel\u00f5 szem\u00e9lyi j\u00f6vedelemad\u00f3": {},
"Mag\u00e1nnyugd\u00edjp\u00e9nzt\u00e1ri tagd\u00edjak, hozz\u00e1j\u00e1r.": {},
"Szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {},
"Term\u00e9szetbeni juttat\u00e1sok": {}
},
"\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
"Terv szerinti egy\u00f6sszeg\u00fb (kis\u00e9rt\u00e9k\u00fbek)": {},
"Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9s line\u00e1ris": {}
}
},
"root_type": ""
},
"M\u00e9rleg sz\u00e1ml\u00e1k": {
"BEFEKTETETT ESZK\u00d6Z\u00d6K": {
"BEFEKTETETT P\u00fc.I ESZK\u00d6Z\u00d6K R\u00c9SZESED\u00c9SEK": {
"Egy\u00e9b tart\u00f3s r\u00e9szesed\u00e9s": {},
"R\u00e9szesed\u00e9sek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
"R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {},
"Tart\u00f3s r\u00e9szesed\u00e9s kapcs. v\u00e1llalkoz\u00e1sban": {}
},
"BERUH\u00c1Z\u00c1SOK, FEL\u00faJ\u00cdT\u00c1SOK": {
"Befejezetlen beruh\u00e1z\u00e1sok": {},
"Beruh\u00e1z\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kk.": {},
"Fel\u00faj\u00edt\u00e1sok": {}
},
"EGY\u00c9B BERENDEZ\u00c9SEK, FELSZ., J\u00c1RM\u00dcVEK": {
"Egy\u00e9b g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb\u00edt\u00e9s": {},
"Egy\u00e9b j\u00e1rm\u00fbvek": {},
"Irodai, igazgat\u00e1si berendez\u00e9sek": {},
"\u00dczemi berendez\u00e9sek, g\u00e9pek,felszerel\u00e9sek": {},
"\u00dczemk\u00f6r\u00f6n kiv\u00fcli berendez\u00e9sek, felsz.": {}
},
"HITELVISZONYT MEGTESTES\u00cdT\u00d6 \u00c9RT\u00c9KPAP\u00cdROK": {
"Egy\u00e9b v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {},
"Kapcsolt v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {},
"Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {},
"\u00c1llamk\u00f6tv\u00e9nyek": {},
"\u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {}
},
"IMMATERI\u00c1LIS JAVAK": {
"Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {},
"Immateri\u00e1lis javak \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
"K\u00eds\u00e9rleti fejleszt\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {},
"Szellemi term\u00e9kek": {},
"Vagyoni \u00e9rt\u00e9k\u00fb jogok": {},
"\u00dczleti vagy c\u00e9g\u00e9rt\u00e9k": {}
},
"INGATLANOK, KAPCS. VAGYONI \u00c9RT. JOGOK": {
"Egy\u00e9b \u00e9p\u00edtm\u00e9nyek": {},
"F\u00f6ldter\u00fclet": {},
"Ingatlanhoz kapcs. vagyoni \u00e9rt. jogok": {},
"Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
"Telek, telkes\u00edt\u00e9s": {},
"\u00c9p\u00fcletek,\u00e9p\u00fcletr\u00e9szek,tulajdoni h\u00e1nyadok": {},
"\u00dczemk\u00f6r\u00f6n kiv\u00fcli ingatlanok, \u00e9p\u00fcletek": {}
},
"M\u00dcSZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u00dcVEK": {
"M\u00fcszaki g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb.": {},
"Termel\u00e9sben r\u00e9sztvev\u00f5 j\u00e1rm\u00fbvek": {},
"Termel\u00f5 g\u00e9pek, berendez\u00e9sek, gy\u00e1rt\u00f3eszk.": {}
},
"TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K": {
"Egy\u00e9b tart\u00f3s bankbet\u00e9tek": {},
"Egy\u00e9b tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {},
"P\u00e9nz\u00fcgyi l\u00edzing miatti tart\u00f3s k\u00f6vetel\u00e9s": {},
"Tart\u00f3s bankbet\u00e9tek egy\u00e9b r\u00e9sz. v\u00e1ll.-ban": {},
"Tart\u00f3s bankbet\u00e9tek kapcs. v\u00e1ll.-ban": {},
"Tart\u00f3san adott k\u00f6lcs\u00f6n egy\u00e9b r\u00e9sz.v\u00e1ll.": {},
"Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k kapcs. v\u00e1ll.": {},
"Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k \u00e9rt\u00e9kveszt\u00e9se": {}
},
"TENY\u00c9SZ\u00c1LLATOK": {
"Teny\u00e9sz\u00e1llatok": {}
}
},
"FORR\u00c1SOK (PASSZ\u00cdV\u00c1K)": {
"C\u00c9LTARTAL\u00c9KOK": {
"C\u00e9ltartal\u00e9k v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gre": {}
},
"EGY\u00c9B R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
"El\u00f5zetesen felsz\u00e1m\u00edtott \u00e1lt.forgalmi ad\u00f3": {},
"Fizetend\u00f5 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {},
"K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6t.teljes\u00edt\u00e9se": {},
"K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek": {},
"Szem\u00e9lyi j\u00f6vedelemad\u00f3 elsz\u00e1mol\u00e1sa": {},
"T\u00e1rsas\u00e1gi ad\u00f3 \u00e9s osztal\u00e9kad\u00f3 elsz\u00e1mol\u00e1s": {},
"V\u00e1m- \u00e9s P\u00e9nz\u00fcgy\u00f5rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"\u00c1fa p\u00e9nz\u00fcgyi elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"\u00d6nkorm\u00e1nyzati ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla": {}
},
"HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
"Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek": {},
"Egy\u00e9b hossz\u00fa lej. k\u00f6telezetts\u00e9gek": {},
"Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek": {},
"Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {},
"P\u00e9nz\u00fcgyi l\u00edzinggel kapcsolatos k\u00f6telez.": {},
"Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l": {},
"Tart\u00f3s k\u00f6t. egy\u00e9b r\u00e9sz. v\u00e1ll. szemben": {},
"Tart\u00f3s k\u00f6t. kapcs. v\u00e1llalkoz\u00e1ssal sz.": {},
"\u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek": {}
},
"H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
"H\u00e1trasorolt k\u00f6telezetts\u00e9g": {}
},
"PASSZ\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
"Bev\u00e9telek passz\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {},
"Halasztott bev\u00e9telek": {},
"K\u00f6lts\u00e9gek,r\u00e1ford. passz\u00edv id\u00f5beli elhat.": {}
},
"R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
"R\u00f6vid lej\u00e1rat\u00fa hitelek": {},
"R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {},
"Sz\u00e1ll\u00edt\u00f3k": {
"Belf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
"account_type": "Payable"
},
"K\u00fclf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
"account_type": "Payable"
}
},
"Vev\u00f5kt\u00f5l kapott el\u00f5legek": {}
},
"SAJ\u00c1T T\u00d6KE": {
"Eredm\u00e9nytartal\u00e9k": {},
"Jegyzett t\u00f5ke": {},
"Lek\u00f6t\u00f6tt tartal\u00e9k": {},
"M\u00e9rleg szerinti eredm\u00e9ny": {},
"T\u00f5ketartal\u00e9k": {},
"\u00c9rt\u00e9kel\u00e9si tartal\u00e9k": {}
},
"\u00c9VI M\u00c9RLEG SZ\u00c1ML\u00c1K": {
"Nyit\u00f3m\u00e9rleg sz\u00e1mla": {}
}
},
"K\u00c9SZLETEK": {
"ANYAGOK": {
"Seg\u00e9danyagok": {}
},
"BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZTERM\u00c9KEK": {
"Befejezetlen termel\u00e9s": {}
},
"BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
"Bet\u00e9td\u00edjas g\u00f6ngy\u00f6legek": {}
},
"K\u00c9SZTERM\u00c9KEK": {
"K\u00e9szterm\u00e9kek": {}
},
"K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK": {
"K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {}
},
"\u00c1RUK": {
"\u00c1ruk beszerz\u00e9si \u00e1ron": {}
}
},
"K\u00d6VETEL\u00c9SEK,P\u00c9NZ\u00dcGYI ESZK,AKT\u00cdV ID\u00d6B.ELH": {
"ADOTT EL\u00d6LEGEK": {
"Adott el\u00f5legek": {}
},
"AKT\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
"Akt\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {}
},
"EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
"K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek": {},
"Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9s": {}
},
"K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL.- SZOLG\u00c1LTAT\u00c1SB\u00d3L": {
"Belf\u00f6ldi k\u00f6vetel\u00e9sek": {
"account_type": "Receivable"
},
"K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek": {
"account_type": "Receivable"
}
},
"P\u00c9NZESZK\u00d6Z\u00d6K": {
"Deviza bet\u00e9tsz\u00e1mla": {
"account_type": "Bank"
},
"Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k": {
"account_type": "Bank"
},
"Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla": {
"Banksz\u00e1mla": {
"account_type": "Bank"
}
},
"P\u00e9nzhelyettes\u00edt\u00f5 eszk. (utalv\u00e1ny, jegy)": {
"account_type": "Bank"
},
"P\u00e9nzt\u00e1rak": {
"P\u00e9nzt\u00e1r": {
"account_type": "Cash"
}
},
"Valuta p\u00e9nzt\u00e1r": {
"account_type": "Cash"
},
"\u00c1tvezet\u00e9si sz\u00e1mla": {
"account_type": "Bank"
}
},
"\u00c9RT\u00c9KPAP\u00cdROK": {
"Egy\u00e9b r\u00e9szesed\u00e9s": {},
"Forgat\u00e1si c\u00e9l\u00fa hitelv. m. \u00e9rt\u00e9kpap\u00edrok": {},
"R\u00e9szesed\u00e9s kapcsolt v\u00e1llalkoz\u00e1sban": {},
"Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {}
}
},
"root_type": ""
}
}
}

View File

@@ -1,716 +0,0 @@
{
"country_code": "nl",
"name": "Nederlands - Grootboekschema",
"tree": {
"FABRIKAGEREKENINGEN": {
"root_type": ""
},
"FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
"KORTLOPENDE SCHULDEN": {
"Accountantskosten": {},
"Af te dragen Btw-verlegd": {
"account_type": "Tax"
},
"Afdracht loonheffing": {},
"Btw af te dragen hoog": {
"account_type": "Tax"
},
"Btw af te dragen laag": {
"account_type": "Tax"
},
"Btw af te dragen overig": {
"account_type": "Tax"
},
"Btw oude jaren": {
"account_type": "Tax"
},
"Btw te vorderen hoog": {
"account_type": "Tax"
},
"Btw te vorderen laag": {
"account_type": "Tax"
},
"Btw te vorderen overig": {
"account_type": "Tax"
},
"Btw-afdracht": {
"account_type": "Tax"
},
"Crediteuren": {
"account_type": "Payable"
},
"Dividend": {},
"Dividendbelasting": {},
"Energiekosten": {},
"Investeringsaftrek": {},
"Loonheffing": {},
"Overige te betalen posten": {},
"Pensioenpremies": {},
"Premie WIR": {},
"Rekening-courant inkoopvereniging": {},
"Rente": {},
"Sociale lasten": {},
"Tanti\u00e8mes": {},
"Te vorderen Btw-verlegd": {
"account_type": "Tax"
},
"Telefoon/telefax": {},
"Termijnen onderh. werk": {},
"Vakantiedagen": {},
"Vakantiegeld": {},
"Vakantiezegels": {},
"Vennootschapsbelasting": {},
"Vooruit ontvangen bedr.": {}
},
"LIQUIDE MIDDELEN": {
"ABN-AMRO bank": {
"account_type": "Cash"
},
"BIZNER bank": {
"account_type": "Cash"
},
"Bankbetaalkaarten": {},
"Effecten": {},
"Girobetaalkaarten": {},
"Kas": {
"account_type": "Cash"
},
"Kas valuta": {
"account_type": "Cash"
},
"Kleine kas": {
"account_type": "Cash"
},
"Kruisposten": {},
"Postbank": {
"account_type": "Cash"
},
"RABO bank": {
"account_type": "Cash"
}
},
"VORDERINGEN": {
"Debiteuren": {
"account_type": "Receivable"
},
"Dubieuze debiteuren": {},
"Overige vorderingen": {},
"Rekening-courant directie": {},
"Te ontvangen ziekengeld": {},
"Voorschotten personeel": {},
"Vooruitbetaalde kosten": {},
"Voorziening dubieuze debiteuren": {}
},
"root_type": ""
},
"INDIRECTE KOSTEN": {
"root_type": ""
},
"KOSTENREKENINGEN": {
"AFSCHRIJVINGEN": {
"Aanhangwagens": {},
"Aankoopkosten": {},
"Aanloopkosten": {},
"Auteursrechten": {},
"Bedrijfsgebouwen": {},
"Bedrijfsinventaris": {},
"Drankvergunningen": {},
"Fabrieksinventaris": {},
"Gebouwen": {},
"Gereedschappen": {},
"Goodwill": {},
"Grondverbetering": {},
"Heftrucks": {},
"Kantine-inventaris": {},
"Kantoorinventaris": {},
"Kantoormachines": {},
"Licenties": {},
"Machines": {},
"Magazijninventaris": {},
"Octrooien": {},
"Ontwikkelingskosten": {},
"Pachtersinvestering": {},
"Parkeerplaats": {},
"Personenauto's": {},
"Rijwielen en bromfietsen": {},
"Tonnagevergunningen": {},
"Verbouwingen": {},
"Vergunningen": {},
"Voorraadverschillen": {},
"Vrachtauto's": {},
"Winkels": {},
"Woon-winkelhuis": {}
},
"ALGEMENE KOSTEN": {
"Accountantskosten": {},
"Advieskosten": {},
"Assuranties": {},
"Bankkosten": {},
"Juridische kosten": {},
"Overige algemene kosten": {},
"Toev. Ass. eigen risico": {}
},
"BEDRIJFSKOSTEN": {
"Assuranties": {},
"Energie (krachtstroom)": {},
"Gereedschappen": {},
"Hulpmaterialen": {},
"Huur inventaris": {},
"Huur machines": {},
"Leasing invent.operational": {},
"Leasing mach. operational": {},
"Onderhoud inventaris": {},
"Onderhoud machines": {},
"Ophalen/vervoer afval": {},
"Overige bedrijfskosten": {}
},
"FINANCIERINGSKOSTEN": {
"Overige rentebaten": {},
"Overige rentelasten": {},
"Rente bankkrediet": {},
"Rente huurkoopcontracten": {},
"Rente hypotheek": {},
"Rente leasecontracten": {},
"Rente lening o/g": {},
"Rente lening u/g": {}
},
"HUISVESTINGSKOSTEN": {
"Assurantie onroerend goed": {},
"Belastingen onr. Goed": {},
"Energiekosten": {},
"Groot onderhoud onr. Goed": {},
"Huur": {},
"Huurwaarde woongedeelte": {},
"Onderhoud onroerend goed": {},
"Ontvangen huren": {},
"Overige huisvestingskosten": {},
"Pacht": {},
"Schoonmaakkosten": {},
"Toevoeging egalisatieres. Groot onderhoud": {}
},
"KANTOORKOSTEN": {
"Administratiekosten": {},
"Contributies/abonnementen": {},
"Huur kantoorapparatuur": {},
"Internetaansluiting": {},
"Kantoorbenodigdh./drukw.": {},
"Onderhoud kantoorinvent.": {},
"Overige kantoorkosten": {},
"Porti": {},
"Telefoon/telefax": {}
},
"OVERIGE BATEN EN LASTEN": {
"Betaalde schadevergoed.": {},
"Boekverlies vaste activa": {},
"Boekwinst van vaste activa": {},
"K.O. regeling OB": {},
"Kasverschillen": {},
"Kosten loonbelasting": {},
"Kosten omzetbelasting": {},
"Nadelige koersverschillen": {},
"Naheffing bedrijfsver.": {},
"Ontvangen schadevergoed.": {},
"Overige baten": {},
"Overige lasten": {},
"Voordelige koersverschil.": {}
},
"PERSONEELSKOSTEN": {
"Autokostenvergoeding": {},
"Bedrijfskleding": {},
"Belastingvrije uitkeringen": {},
"Bijzondere beloningen": {},
"Congressen, seminars en symposia": {},
"Gereedschapsgeld": {},
"Geschenken personeel": {},
"Gratificaties": {},
"Inhouding pensioenpremies": {},
"Inhouding sociale lasten": {},
"Kantinekosten": {},
"Lonen en salarissen": {},
"Loonwerk": {},
"Managementvergoedingen": {},
"Opleidingskosten": {},
"Oprenting stamrechtverpl.": {},
"Overhevelingstoeslag": {},
"Overige kostenverg.": {},
"Overige personeelskosten": {},
"Overige uitkeringen": {},
"Pensioenpremies": {},
"Provisie": {},
"Reiskosten": {},
"Rijwielvergoeding": {},
"Sociale lasten": {},
"Tanti\u00e8mes": {},
"Thuiswerkers": {},
"Toev. Backservice pens.verpl.": {},
"Toevoeging pensioenverpl.": {},
"Uitkering ziekengeld": {},
"Uitzendkrachten": {},
"Vakantiebonnen": {},
"Vakantiegeld": {},
"Vergoeding studiekosten": {},
"Wervingskosten personeel": {}
},
"VERKOOPKOSTEN": {
"Advertenties": {},
"Afschrijving dubieuze deb.": {},
"Beurskosten": {},
"Etalagekosten": {},
"Exportkosten": {},
"Kascorrecties": {},
"Overige verkoopkosten": {},
"Provisie": {},
"Reclame": {},
"Reis en verblijfkosten": {},
"Relatiegeschenken": {},
"Representatiekosten": {},
"Uitgaande vrachten": {},
"Veilingkosten": {},
"Verpakkingsmateriaal": {},
"Websitekosten": {}
},
"VERVOERSKOSTEN": {
"Assuranties auto's": {},
"Brandstoffen": {},
"Leasing auto's": {},
"Onderhoud personenauto's": {},
"Onderhoud vrachtauto's": {},
"Overige vervoerskosten": {},
"Priv\u00e9-gebruik auto's": {},
"Wegenbelasting": {}
},
"root_type": ""
},
"OVERIGE RESULTATEN": {
"Memoriaal": {
"account_type": "Cash"
},
"Opbrengsten deelnemingen": {},
"Reorganisatiekosten": {},
"Verlies verkoop deelnem.": {},
"Voorz. Verlies deelnem.": {},
"Vpb bijzonder resultaat": {},
"Vpb normaal resultaat": {},
"Winst": {},
"Winst bij verkoop deelnem.": {},
"root_type": ""
},
"TUSSENREKENINGEN": {
"Betaalwijze cadeaubonnen": {
"account_type": "Cash"
},
"Betaalwijze chipknip": {
"account_type": "Cash"
},
"Betaalwijze contant": {
"account_type": "Cash"
},
"Betaalwijze pin": {
"account_type": "Cash"
},
"Inkopen Nederland hoog": {
"account_type": "Cash"
},
"Inkopen Nederland laag": {
"account_type": "Cash"
},
"Inkopen Nederland onbelast": {
"account_type": "Cash"
},
"Inkopen Nederland overig": {
"account_type": "Cash"
},
"Inkopen Nederland verlegd": {
"account_type": "Cash"
},
"Inkopen binnen EU hoog": {
"account_type": "Cash"
},
"Inkopen binnen EU laag": {
"account_type": "Cash"
},
"Inkopen binnen EU overig": {
"account_type": "Cash"
},
"Inkopen buiten EU hoog": {
"account_type": "Cash"
},
"Inkopen buiten EU laag": {
"account_type": "Cash"
},
"Inkopen buiten EU overig": {
"account_type": "Cash"
},
"Kassa 1": {
"account_type": "Cash"
},
"Kassa 2": {
"account_type": "Cash"
},
"Netto lonen": {
"account_type": "Cash"
},
"Tegenrekening Inkopen": {
"account_type": "Cash"
},
"Tussenrek. autom. betalingen": {
"account_type": "Cash"
},
"Tussenrek. autom. loonbetalingen": {
"account_type": "Cash"
},
"Tussenrek. cadeaubonbetalingen": {
"account_type": "Cash"
},
"Tussenrekening balans": {
"account_type": "Cash"
},
"Tussenrekening chipknip": {
"account_type": "Cash"
},
"Tussenrekening correcties": {
"account_type": "Cash"
},
"Tussenrekening pin": {
"account_type": "Cash"
},
"Vraagposten": {
"account_type": "Cash"
},
"root_type": ""
},
"VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
"EIGEN VERMOGEN": {
"Aandelenkapitaal": {
"account_type": "Equity"
},
"Assuranties": {
"account_type": "Equity"
},
"Buitengewone lasten": {
"account_type": "Equity"
},
"Giften": {
"account_type": "Equity"
},
"Huishoudgeld": {
"account_type": "Equity"
},
"Inkomstenbelasting": {
"account_type": "Equity"
},
"Kapitaal": {
"account_type": "Equity"
},
"Overige persoonlijke verplichtingen": {
"account_type": "Equity"
},
"Overige priv\u00e9-uitgaven": {
"account_type": "Equity"
},
"Overige reserves": {
"account_type": "Equity"
},
"Premie lijfrenteverzekeringen": {
"account_type": "Equity"
},
"Premie volksverzekeringen": {
"account_type": "Equity"
},
"Priv\u00e9-gebruik": {
"account_type": "Equity"
},
"Priv\u00e9-opnamen/stortingen": {
"account_type": "Equity"
},
"Vermogensbelasting": {
"account_type": "Equity"
},
"WAO en ziekengeldverzekeringen": {
"account_type": "Equity"
},
"Wettelijke reserves": {
"account_type": "Equity"
}
},
"FINANCIELE VASTE ACTIVA EN LANGLOPENDE VORDERINGEN": {
"FINANCIELE VASTE ACTIVA": {
"Aandeel inkoopcombinatie": {},
"Meerderheidsdeelnemingen": {},
"Minderheidsdeelnemingen": {}
},
"LANGLOPENDE VORDERINGEN": {
"Financieringskosten": {},
"Financieringskosten huurkoop": {},
"Hypotheken u/g 1": {},
"Hypotheken u/g 2": {},
"Hypotheken u/g 3": {},
"Leningen u/g 1": {},
"Leningen u/g 2": {},
"Leningen u/g 3": {},
"Leningen u/g 4": {},
"Leningen u/g 5": {},
"Vorderingen op deelnemingen": {},
"Waarborgsommen": {}
}
},
"IMMATERIELE ACTIVA": {
"Aanschafwaarde Aanloopkosten": {},
"Aanschafwaarde Auteursrechten": {},
"Aanschafwaarde Drankvergunningen": {},
"Aanschafwaarde Goodwill": {},
"Aanschafwaarde Octrooien": {},
"Aanschafwaarde Ontwikkelingskosten": {},
"Aanschafwaarde Tonnagevergunningen": {},
"Aanschafwaarde Vergunningen": {},
"Afschrijving Aanloopkosten": {},
"Afschrijving Auteursrechten": {},
"Afschrijving Drankvergunningen": {},
"Afschrijving Goodwill": {},
"Afschrijving Licenties": {},
"Afschrijving Octrooien": {},
"Afschrijving Ontwikkelingskosten": {},
"Afschrijving Tonnagevergunningen": {},
"Afschrijving Vergunningen": {}
},
"LANGLOPENDE SCHULDEN EN AFLOSSINGEN": {
"AFLOSSINGEN": {
"Huurkoopverplichtingen": {},
"Hypotheek o/g 1": {},
"Hypotheek o/g 2": {},
"Hypotheek o/g 3": {},
"Hypotheek o/g 4": {},
"Hypotheek o/g 5": {},
"Lease-verplichtingen": {}
},
"LANGLOPENDE SCHULDEN": {
"Huurkoopverplichtingen": {},
"Hypotheken o/g 1": {},
"Hypotheken o/g 2": {},
"Hypotheken o/g 3": {},
"Hypotheken o/g 4": {},
"Hypotheken o/g 5": {},
"Lease-verplichtingen": {},
"Leningen o/g 1": {},
"Leningen o/g 2": {},
"Leningen o/g 3": {},
"Leningen o/g 4": {},
"Leningen o/g 5": {},
"Rekening-courant directie": {}
}
},
"MACHINES EN INVENTARIS": {
"INVENTARIS": {
"Aanschafwaarde Bedrijfsinventaris": {},
"Aanschafwaarde Fabrieksinventaris": {},
"Aanschafwaarde Gereedschappen": {},
"Aanschafwaarde Kantine-inventaris": {},
"Aanschafwaarde Kantoorinventaris": {},
"Aanschafwaarde Kantoormachines": {},
"Aanschafwaarde Magazijninventaris": {},
"Afschrijving Bedrijfsinventaris": {},
"Afschrijving Fabrieksinventaris": {},
"Afschrijving Gereedschappen": {},
"Afschrijving Kantine-inventaris": {},
"Afschrijving Kantoorinventaris": {},
"Afschrijving Kantoormachines": {},
"Afschrijving Magazijninventaris": {}
},
"MACHINES": {
"Aanschafwaarde Machines 1": {},
"Aanschafwaarde Machines 2": {},
"Aanschafwaarde Machines 3": {},
"Aanschafwaarde Machines 4": {},
"Aanschafwaarde Machines 5": {},
"Afschrijving Machines 1": {},
"Afschrijving Machines 2": {},
"Afschrijving Machines 3": {},
"Afschrijving Machines 4": {},
"Afschrijving Machines 5": {}
}
},
"ONROERENDE GOEDEREN": {
"Aanschafwaarde Aanloopkosten": {},
"Aanschafwaarde Bedrijfsgebouwen": {},
"Aanschafwaarde Gebouwen": {},
"Aanschafwaarde Grondverbetering": {},
"Aanschafwaarde Landerijen": {},
"Aanschafwaarde Ondergrond gebouwen": {},
"Aanschafwaarde Pachtersinvesteringen": {},
"Aanschafwaarde Parkeerplaats": {},
"Aanschafwaarde Verbouwingen": {},
"Aanschafwaarde Winkels": {},
"Aanschafwaarde Woon-winkelhuis": {},
"Afschrijving Aanloopkosten": {},
"Afschrijving Bedrijfsgebouwen": {},
"Afschrijving Gebouwen": {},
"Afschrijving Grondverbetering": {},
"Afschrijving Pachtersinvesteringen": {},
"Afschrijving Parkeerplaats": {},
"Afschrijving Verbouwingen": {},
"Afschrijving Winkels": {},
"Afschrijving Woon-winkelhuis": {}
},
"VERVOERMIDDELEN": {
"Aanschafwaarde Aanhangwagens": {},
"Aanschafwaarde Heftrucks": {},
"Aanschafwaarde Personenauto's": {},
"Aanschafwaarde Rijwielen en bromfietsen": {},
"Aanschafwaarde Vrachtauto's": {},
"Afschrijving Aanhangwagens": {},
"Afschrijving Heftrucks": {},
"Afschrijving Personenauto's": {},
"Afschrijving Rijwielen en bromfietsen": {},
"Afschrijving Vrachtauto's": {}
},
"VOORZIENINGEN": {
"Assurantie eigen risico": {
"account_type": "Equity"
},
"Backservice pensioenverpl.": {
"account_type": "Equity"
},
"Egalisatierekening WIR": {
"account_type": "Equity"
},
"Egalisatieres. grootonderh.": {
"account_type": "Equity"
},
"Garantieverplichtingen": {
"account_type": "Equity"
},
"Latente belastingverpl.": {
"account_type": "Equity"
},
"Pens.voorz. eigen beheer": {
"account_type": "Equity"
},
"Pensioenverplichtingen": {
"account_type": "Equity"
},
"Stamrechtverplichtingen": {
"account_type": "Equity"
},
"Vervangingsreserve": {
"account_type": "Equity"
},
"Voorziening deelnemingen": {
"account_type": "Equity"
}
},
"root_type": ""
},
"VERKOOPRESULTATEN": {
"Diensten fabric. 0% niet-EU": {},
"Diensten fabricage 0% EU": {},
"Diensten fabricage hoog": {},
"Diensten fabricage laag": {},
"Diensten fabricage overig": {},
"Diensten handel 0% EU": {},
"Diensten handel 0% niet-EU": {},
"Diensten handel hoog tarief": {},
"Diensten handel laag tarief": {},
"Verkopen Fabric. 0% niet-EU": {},
"Verkopen Handel 0% niet-EU": {},
"Verkopen fabric. 0 % EU": {},
"Verkopen fabricage hoog": {},
"Verkopen fabricage laag": {},
"Verkopen fabricage overig": {},
"Verkopen handel 0% EU": {},
"Verkopen handel hoog": {},
"Verkopen handel laag": {},
"Verkopen handel overig": {},
"Verleende Kredietbep. fabricage": {},
"Verleende Kredietbep. handel": {},
"root_type": ""
},
"VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
"Betalingskort. crediteuren": {},
"Garantiekosten": {},
"Hulpmaterialen": {},
"Inkomende vrachten": {},
"Inkoop import buiten EU hoog": {},
"Inkoop import buiten EU laag": {},
"Inkoop import buiten EU overig": {},
"Inkoopbonussen": {},
"Inkoopkosten": {},
"Inkoopprovisie": {},
"Inkopen BTW verlegd": {},
"Inkopen EU hoog tarief": {},
"Inkopen EU laag tarief": {},
"Inkopen EU overig": {},
"Inkopen hoog": {},
"Inkopen laag": {},
"Inkopen nul": {},
"Inkopen overig": {},
"Invoerkosten": {},
"Kosten inkoopvereniging": {},
"Kostprijs omzet grondstoffen": {},
"Kostprijs omzet handelsgoederen": {},
"Onttrekking uitgev.garantie": {},
"Priv\u00e9-gebruik goederen": {},
"Tegenrekening inkoop": {},
"Toev. Voorz. incour. grondst.": {},
"Toevoeging garantieverpl.": {},
"Toevoeging voorz. incour. handelsgoed.": {},
"Uitbesteed werk": {},
"Voorz. Incourourant grondst.": {},
"Voorz.incour. handelsgoed.": {},
"root_type": ""
},
"VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
"Emballage": {
"account_type": "Cash"
},
"Gereed product 1": {
"account_type": "Cash"
},
"Gereed product 2": {
"account_type": "Cash"
},
"Goederen 1": {
"account_type": "Cash"
},
"Goederen 2": {
"account_type": "Cash"
},
"Goederen in consignatie": {
"account_type": "Cash"
},
"Goederen onderweg": {
"account_type": "Cash"
},
"Grondstoffen 1": {
"account_type": "Cash"
},
"Grondstoffen 2": {
"account_type": "Cash"
},
"Halffabrikaten 1": {
"account_type": "Cash"
},
"Halffabrikaten 2": {
"account_type": "Cash"
},
"Hulpstoffen 1": {
"account_type": "Cash"
},
"Hulpstoffen 2": {
"account_type": "Cash"
},
"Kantoorbenodigdheden": {
"account_type": "Cash"
},
"Onderhanden werk": {
"account_type": "Cash"
},
"Verpakkingsmateriaal": {
"account_type": "Cash"
},
"Zegels": {
"account_type": "Cash"
},
"root_type": ""
}
}
}

View File

@@ -12,7 +12,7 @@
"Accrued Rebates Due from Suppliers": {
"account_type": "Receivable"
},
"Accured Income from Suppliers": {
"Accrued Income from Suppliers": {
"account_type": "Receivable"
},
"Other Debtors": {
@@ -54,7 +54,7 @@
}
},
"Petty Cash": {
"Petty Cash - Admininistration": {
"Petty Cash - Administration": {
"account_type": "Cash"
},
"Petty Cash - Others": {
@@ -85,13 +85,13 @@
"Handling Difference in Inventory": {
"account_type": "Stock Adjustment"
},
"Items Delivered to Customs on temprary Base": {}
"Items Delivered to Customs on temporary Base": {}
},
"Stock in Hand": {
"account_type": "Stock"
}
},
"Perliminary and Preoperating Expenses": {
"Preliminary and Preoperating Expenses": {
"Preoperating Expenses": {}
},
"Prepayments & Deposits": {
@@ -150,16 +150,16 @@
"account_type": "Fixed Asset"
},
"Leasehold Improvement": {},
"Motor Vehicules": {
"Motor Vehicles": {
"account_type": "Fixed Asset"
},
"Work In Progrees": {},
"Work In Progress": {},
"account_type": "Fixed Asset"
}
},
"Intangible Assets": {
"Computer Card Renewal": {},
"Dispoal of Outlets": {},
"Disposal of Outlets": {},
"Registration of Trademarks": {}
},
"Intercompany Accounts": {},
@@ -218,7 +218,7 @@
},
"MISC Charges": {
"Other Charges": {
"Captial Loss": {
"Capital Loss": {
"Disposal of Business Branch": {},
"Loss On Fixed Assets Disposal": {},
"Loss on Difference on Exchange": {}
@@ -253,14 +253,14 @@
"Other Bank Charges": {}
},
"Communications": {
"Courrier": {},
"Courier": {},
"Others - Communication": {},
"Telephone": {},
"Web Site Hosting Fees": {}
},
"Office & Various Expenses": {
"Cleaning": {},
"Convoyance Expenses": {},
"Conveyance Expenses": {},
"Gifts & Donations": {},
"Insurance": {},
"Kitchen and Buffet Expenses": {},
@@ -325,7 +325,7 @@
"Current Liabilities": {
"Accounts Payable": {
"Payables": {
"Advance Paybale to Suppliers": {
"Advance Payable to Suppliers": {
"account_type": "Payable"
},
"Consigned Payable": {

View File

@@ -0,0 +1,840 @@
{
"country_code": "ar",
"name": "Argentina - Chart of Accounts",
"tree": {
"ACTIVO": {
"ACTIVO CORRIENTE": {
"CAJA Y BANCOS": {
"BANCOS": {
"Banco de la Nacio\u0301n Argentina(ejemplo) c/c en": {
"account_number": "1.1.1.02.01"
},
"Banco del exterior": {
"account_number": "1.1.1.02.03"
},
"account_number": "1.1.1.02.00",
"account_type": "Bank"
},
"CAJAS": {
"Caja": {
"account_number": "1.1.1.01.01"
},
"Caja chica": {
"account_number": "1.1.1.01.02"
},
"Caja en Moneda Extranjera": {
"account_number": "1.1.1.01.03"
},
"Tarjetas - Cupones": {
"account_number": "1.1.1.01.05"
},
"Valores a depositar": {
"account_number": "1.1.1.01.04"
},
"account_number": "1.1.1.01.00",
"account_type": "Cash"
},
"account_number": "1.1.1.00.00"
},
"CRE\u0301DITOS POR VENTAS DE SERVICIOS": {
"DEUDORES EN CTA. CTE": {
"Deudores Morosos": {
"account_number": "1.1.3.01.03",
"account_type": "Chargeable"
},
"Deudores del exterior": {
"account_number": "1.1.3.01.02",
"account_type": "Receivable"
},
"Deudores en Gestio\u0301n Judicial": {
"account_number": "1.1.3.01.04"
},
"Deudores locales": {
"account_number": "1.1.3.01.01",
"account_type": "Receivable"
},
"account_number": "1.1.3.01.00"
},
"Documentos a cobrar por Vas. de Servicios": {
"account_number": "1.1.3.02.00",
"account_type": "Receivable"
},
"Previsio\u0301n para deudores incobrables": {
"account_number": "1.1.3.03.00"
},
"account_number": "1.1.3.00.00"
},
"INVENTARIOS": {
"account_number": "1.1.6.00.00",
"account_type": "Stock",
"is_group": 1
},
"INVERSIONES TEMPORARIAS": {
"DEPO\u0301SITOS A PLAZO FIJO": {
"Depo\u0301sitos a Plazo Fijo en moneda": {
"account_number": "1.1.2.02.02",
"account_type": "Receivable"
},
"Depo\u0301sitos a Plazo Fijo en pesos": {
"account_number": "1.1.2.02.01",
"account_type": "Receivable"
},
"account_number": "1.1.2.02.00"
},
"INVERSIONES EN ACCIONES": {
"Acciones": {
"account_number": "1.1.2.01.01",
"account_type": "Receivable"
},
"account_number": "1.1.2.01.00"
},
"account_number": "1.1.2.00.00"
},
"OTROS ACTIVOS CORRIENTES": {
"account_number": "1.1.5.00.00",
"is_group": 1
},
"OTROS CRE\u0301DITOS CORRIENTES": {
"CRE\u0301DITOS DIVERSOS CORRIENTES": {
"Anticipos a Proveedores (No cong.": {
"account_number": "1.1.4.02.03",
"account_type": "Receivable"
},
"Anticipos de Sueldos": {
"account_number": "1.1.4.02.04"
},
"Arrendamiento pagado por adelantado": {
"account_number": "1.1.4.02.07"
},
"Cuentas Particulares Directores": {
"account_number": "1.1.4.02.01"
},
"Cuentas Particulares Socios/Accionistas": {
"account_number": "1.1.4.02.02"
},
"Depo\u0301sitos pendientes de acreditacio\u0301n": {
"account_number": "1.1.4.02.06"
},
"Pre\u0301stamos al personal": {
"account_number": "1.1.4.02.05"
},
"account_number": "1.1.4.02.00"
},
"CRE\u0301DITOS IMPOSITIVOS CORRIENTES": {
"Activos por Impuesto Diferido (Ctes.)": {
"account_number": "1.1.4.01.12"
},
"Anticipos Impuesto a las Ganancias": {
"account_number": "1.1.4.01.01"
},
"Anticipos Impuesto a los Ingresos Brutos": {
"account_number": "1.1.4.01.02"
},
"Cre\u0301ditos por quebrantos impositivos no": {
"account_number": "1.1.4.01.11"
},
"IVA Cre\u0301dito Fiscal": {
"account_number": "1.1.4.01.05"
},
"IVA Cre\u0301dito Fiscal Exportacio\u0301n": {
"account_number": "1.1.4.01.06"
},
"IVA Saldo a Favor Te\u0301cnico": {
"account_number": "1.1.4.01.07"
},
"IVA Saldo a Favor de Libre": {
"account_number": "1.1.4.01.09"
},
"Percepciones y Retenciones Impto. a las Ganancias": {
"account_number": "1.1.4.01.03"
},
"Percepciones y Retenciones Impto. a los": {
"account_number": "1.1.4.01.04"
},
"Percepciones y Retenciones de IVA": {
"account_number": "1.1.4.01.10"
},
"account_number": "1.1.4.01.00"
},
"account_number": "1.1.4.00.00"
},
"account_number": "1.1.0.00.00"
},
"ACTIVO NO CORRIENTE": {
"ACTIVOS INTANGIBLES": {
"MARCAS Y PATENTES": {
"Amortizaciones Acumuladas Marcas y": {
"account_number": "1.2.3.01.03"
},
"Marcas y Patentes Actualizaciones": {
"account_number": "1.2.3.01.02"
},
"Marcas y Patentes Valores Originales": {
"account_number": "1.2.3.01.01"
},
"account_number": "1.2.3.01.00"
},
"account_number": "1.2.3.00.00"
},
"BIENES DE USO": {
"HERRAMIENTAS": {
"Amortizaciones Acumuladas": {
"account_number": "1.2.2.09.03",
"account_type": "Depreciation"
},
"Herramientas Ajuste": {
"account_number": "1.2.2.09.02"
},
"Herramientas Valores Originales": {
"account_number": "1.2.2.09.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.09.00"
},
"INMUEBLES": {
"Amortizaciones Acumuladas Inmuebles": {
"account_number": "1.2.2.01.03",
"account_type": "Depreciation"
},
"Inmuebles Actualizaciones": {
"account_number": "1.2.2.01.02"
},
"Inmuebles Valores originales": {
"account_number": "1.2.2.01.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.01.00"
},
"INSTALACIONES": {
"Amortizaciones Acumuladas": {
"account_number": "1.2.2.08.03",
"account_type": "Depreciation"
},
"Instalaciones Ajuste": {
"account_number": "1.2.2.08.02"
},
"Instalaciones Valores Originales": {
"account_number": "1.2.2.08.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.08.00"
},
"MAQUINARIAS Y EQUIPOS": {
"Amortizaciones Acumuladas Maquinarias": {
"account_number": "1.2.2.02.03",
"account_type": "Depreciation"
},
"Maquinarias y Equipos Actualizaciones": {
"account_number": "1.2.2.02.02"
},
"Maquinarias y Equipos Valores de origen": {
"account_number": "1.2.2.02.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.02.00"
},
"MUEBLES Y U\u0301TILES": {
"Amortizaciones Acumuladas Muebles y": {
"account_number": "1.2.2.03.03",
"account_type": "Depreciation"
},
"Muebles y U\u0301tiles Actualizaciones": {
"account_number": "1.2.2.03.02"
},
"Muebles y U\u0301tiles Valores de Origen": {
"account_number": "1.2.2.03.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.03.00"
},
"RODADOS": {
"Amortizaciones Acumuladas Rodados": {
"account_number": "1.2.2.04.03",
"account_type": "Depreciation"
},
"Rodados Actualizaciones": {
"account_number": "1.2.2.04.02"
},
"Rodados Valores Originales": {
"account_number": "1.2.2.04.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.04.00"
},
"TERRENOS": {
"Terrenos Actualizaciones": {
"account_number": "1.2.2.07.02"
},
"Terrenos Valores Originales": {
"account_number": "1.2.2.07.01",
"account_type": "Fixed Asset"
},
"account_number": "1.2.2.07.00"
},
"account_number": "1.2.2.00.00"
},
"CRE\u0301DITOS POR VENTA DE SERVICIOS": {
"DEUDORES NO CORRIENTES": {
"Deudores Locales (No Ctes.)": {
"account_number": "1.2.4.01.01"
},
"account_number": "1.2.4.01.00"
},
"Documentos a cobrar por Vtas. de Servicios": {
"account_number": "1.2.4.02.00"
},
"account_number": "1.2.4.00.00"
},
"INVERSIONES PERMANENTES": {
"BONOS DE DEUDA": {
"Bonex": {
"account_number": "1.2.1.01.02"
},
"Ti\u0301tulos Deuda Pu\u0301blica (Pesos)": {
"account_number": "1.2.1.01.01",
"is_group": 1
},
"account_number": "1.2.1.01.00"
},
"DEPO\u0301SITOS A PLAZO FIJO NO": {
"Depo\u0301sitos a plazo fijo en moneda": {
"account_number": "1.2.1.02.02"
},
"Depo\u0301sitos a plazo fijo en pesos (no cte.)": {
"account_number": "1.2.1.02.01"
},
"account_number": "1.2.1.02.00"
},
"INVERSIONES EN BIENES DEPRECIABLES": {
"Amortizaciones Acumuladas Inversiones": {
"account_number": "1.2.1.03.03"
},
"Inversiones en Inmuebles": {
"account_number": "1.2.1.03.02"
},
"Inversiones en Inmuebles Valores": {
"account_number": "1.2.1.03.01"
},
"account_number": "1.2.1.03.00"
},
"account_number": "1.2.1.00.00"
},
"OTROS ACTIVOS NO CORRIENTES": {
"Llave de Negocio": {
"account_number": "1.2.6.01.00"
},
"account_number": "1.2.6.00.00"
},
"OTROS CRE\u0301DITOS NO CORRIENTES": {
"CRE\u0301DITOS DIVERSOS NO CORRIENTES": {
"Cuentas Particulares Directores (No": {
"account_number": "1.2.5.02.01"
},
"Cuentas Particulares Socios/Accionistas": {
"account_number": "1.2.5.02.02"
},
"account_number": "1.2.5.02.00"
},
"CRE\u0301DITOS IMPOSITIVOS NO CORRIENTES": {
"Activos por Impto. Diferido (No Ctes.)": {
"account_number": "1.2.5.01.01"
},
"Cre\u0301ditos por Quebrantos Impositivos no": {
"account_number": "1.2.5.01.02"
},
"account_number": "1.2.5.01.00"
},
"account_number": "1.2.5.00.00"
},
"account_number": "1.2.0.00.00"
},
"account_number": "1.0.0.00.00",
"root_type": "Asset"
},
"EGRESOS": {
"EGRESOS EXTRAORDINARIOS": {
"Ajuste de Amortizaciones acumuladas de": {
"account_number": "5.2.4.00.00"
},
"Ajuste del valor de los bienes": {
"account_number": "5.2.3.00.00"
},
"Amortizaciones extraordinarias": {
"account_number": "5.2.2.00.00"
},
"Pe\u0301rdida por venta bienes de uso": {
"account_number": "5.2.1.00.00"
},
"account_number": "5.2.0.00.00"
},
"EGRESOS ORDINARIOS": {
"GASTOS DE ADMINISTRACIO\u0301N": {
"Amortizaciones - Administracio\u0301n": {
"account_number": "5.1.3.04.00"
},
"Cargas Sociales - Administracio\u0301n": {
"account_number": "5.1.3.02.00"
},
"Certificaciones y Sellados": {
"account_number": "5.1.3.07.00"
},
"Correspondencia - Administracio\u0301n": {
"account_number": "5.1.3.11.00"
},
"Costo sobre ventas": {
"account_number": "5.1.3.15.00",
"account_type": "Cost of Goods Sold"
},
"Energi\u0301a - Administracio\u0301n": {
"account_number": "5.1.3.13.00"
},
"Gastos Bancarios - Administracio\u0301n": {
"account_number": "5.1.3.08.00"
},
"Gastos Varios - Administracio\u0301n": {
"account_number": "5.1.3.09.00"
},
"Gastos de Valoracion": {
"account_number": "5.1.3.16.00",
"account_type": "Expenses Included In Valuation"
},
"Honorarios - Administracio\u0301n": {
"account_number": "5.1.3.03.00"
},
"Insumos Computacio\u0301n - Administracio\u0301n": {
"account_number": "5.1.3.10.00"
},
"Libreri\u0301a y Papeleri\u0301a - Administracio\u0301n": {
"account_number": "5.1.3.06.00"
},
"Mantenimiento - Administracio\u0301n": {
"account_number": "5.1.3.12.00"
},
"Seguros - Administracio\u0301n": {
"account_number": "5.1.3.14.00"
},
"Sueldos - Administracio\u0301n": {
"account_number": "5.1.3.01.00"
},
"Via\u0301ticos - Administracio\u0301n": {
"account_number": "5.1.3.05.00"
},
"account_number": "5.1.3.00.00"
},
"GASTOS DE COMERCIALIZACIO\u0301N": {
"Amortizaciones - Comercializacio\u0301n": {
"account_number": "5.1.4.04.00"
},
"Cargas Sociales - Comercializacio\u0301n": {
"account_number": "5.1.4.02.00"
},
"Comisiones de terceros": {
"account_number": "5.1.4.11.00"
},
"Descuentos otorgados a clientes": {
"account_number": "5.1.4.10.00"
},
"Fletes - Comercializacio\u0301n": {
"account_number": "5.1.4.08.00"
},
"Gastos Varios - Comercializacio\u0301n": {
"account_number": "5.1.4.07.00"
},
"Honorarios - Comercializacio\u0301n": {
"account_number": "5.1.4.06.00"
},
"IVA no computable - Comercializacio\u0301n": {
"account_number": "5.1.4.09.00"
},
"Publicidad - Comercializacio\u0301n": {
"account_number": "5.1.4.03.00"
},
"Quebrantos por deudores": {
"account_number": "5.1.4.12.00"
},
"Seguros - Comercializacio\u0301n": {
"account_number": "5.1.4.05.00"
},
"Sueldos - Comercializacio\u0301n": {
"account_number": "5.1.4.01.00"
},
"Via\u0301ticos - Comercializacio\u0301n": {
"account_number": "5.1.4.13.00"
},
"account_number": "5.1.4.00.00"
},
"GASTOS DE EXPLOTACIO\u0301N": {
"Amortizaciones - Explotacio\u0301n": {
"account_number": "5.1.2.10.00"
},
"Cargas Sociales - Explotacio\u0301n": {
"account_number": "5.1.2.02.00"
},
"Combustibles y Lubricantes - Explotacio\u0301n": {
"account_number": "5.1.2.14.00"
},
"Comida del personal - Explotacio\u0301n": {
"account_number": "5.1.2.08.00"
},
"Cuota me\u0301dica a cargo del empleador": {
"account_number": "5.1.2.09.00"
},
"Despidos - Explotacio\u0301n": {
"account_number": "5.1.2.07.00"
},
"Energi\u0301a - Explotacio\u0301n": {
"account_number": "5.1.2.03.00"
},
"Fletes - Explotacio\u0301n": {
"account_number": "5.1.2.16.00"
},
"Gastos de limpieza - Explotacio\u0301n": {
"account_number": "5.1.2.12.00"
},
"Honorarios Profesionales - Explotacio\u0301n": {
"account_number": "5.1.2.04.00"
},
"Insumos diversos - Explotacio\u0301n": {
"account_number": "5.1.2.15.00"
},
"Mantenimiento - Explotacio\u0301n": {
"account_number": "5.1.2.13.00"
},
"Repuestos y Reparaciones - Explotacio\u0301n": {
"account_number": "5.1.2.11.00"
},
"Ropa de trabajo - Explotacio\u0301n": {
"account_number": "5.1.2.05.00"
},
"Seguros - Explotacio\u0301n": {
"account_number": "5.1.2.06.00"
},
"Sueldos y Jornales - Explotacio\u0301n": {
"account_number": "5.1.2.01.00"
},
"account_number": "5.1.2.00.00"
},
"GASTOS FINANCIEROS": {
"Amortizaciones Inversiones en bienes": {
"account_number": "5.1.5.08.00"
},
"Diferencia de Cambio": {
"account_number": "5.1.5.04.00"
},
"Diferencia de Cambio Balance en": {
"account_number": "5.1.5.05.00"
},
"Intereses a Proveedores": {
"account_number": "5.1.5.02.00"
},
"Intereses y Gastos bancarios": {
"account_number": "5.1.5.01.00"
},
"Intereses y recargos impositivos": {
"account_number": "5.1.5.03.00"
},
"R.E.C.P.A.M": {
"account_number": "5.1.5.09.00"
},
"Resultado por tenencia (negativo)": {
"account_number": "5.1.5.06.00"
},
"Resultado por tenencia negativo de": {
"account_number": "5.1.5.10.00"
},
"account_number": "5.1.5.00.00"
},
"GASTOS SOBRE EXISTENCIAS": {
"Ajuste de Existencia": {
"account_number": "5.1.8.03.00",
"account_type": "Stock Adjustment"
},
"Costo sobre ventas": {
"account_number": "5.1.8.01.00",
"account_type": "Cost of Goods Sold"
},
"Gastos de Valoracion": {
"account_number": "5.1.8.02.00",
"account_type": "Expenses Included In Valuation"
},
"account_number": "5.1.8.00.00"
},
"IMPUESTOS": {
"Impuesto a las Ganancia Mi\u0301nima": {
"account_number": "5.1.7.02.00"
},
"Impuesto a las Ganancias": {
"account_number": "5.1.7.01.00"
},
"Impuesto a los Ingresos Brutos": {
"account_number": "5.1.7.03.00"
},
"Impuesto s/ los De\u0301bitos y Cre\u0301ditos": {
"account_number": "5.1.7.06.00"
},
"Impuestos Territoriales": {
"account_number": "5.1.7.05.00"
},
"Impuestos internos y varios": {
"account_number": "5.1.7.07.00"
},
"Tasa municipal": {
"account_number": "5.1.7.04.00"
},
"account_number": "5.1.7.00.00"
},
"account_number": "5.1.0.00.00"
},
"account_number": "5.0.0.00.00",
"root_type": "Expense"
},
"INGRESOS": {
"INGRESOS EXTRAORDINARIOS": {
"Otros ingresos extraordinarios": {
"account_number": "4.2.3.00.00"
},
"Reintegro de Seguros": {
"account_number": "4.2.2.00.00"
},
"Utilidad Venta Bienes de Uso": {
"account_number": "4.2.1.00.00"
},
"account_number": "4.2.0.00.00"
},
"INGRESOS ORDINARIOS": {
"INGRESOS POR SERVICIOS PRESTADOS": {
"Ingresos de fuente extranjera": {
"account_number": "4.1.1.02.00"
},
"Ventas de Servicios": {
"account_number": "4.1.1.01.00"
},
"account_number": "4.1.1.00.00"
},
"OTROS INGRESOS ORDINARIOS": {
"account_number": "4.1.4.00.00",
"is_group": 1
},
"RESULTADOS FINANCIEROS Y POR": {
"Diferencia tipo de cambio": {
"account_number": "4.1.3.03.00"
},
"Intereses Ganados": {
"account_number": "4.1.3.01.00"
},
"Resultado por Tenencia de acciones": {
"account_number": "4.1.3.02.00"
},
"Resultado por tenencia (positivo)": {
"account_number": "4.1.3.04.00"
},
"account_number": "4.1.3.00.00"
},
"account_number": "4.1.0.00.00"
},
"account_number": "4.0.0.00.00",
"root_type": "Income"
},
"PASIVO": {
"PASIVO CORRIENTE": {
"CARGAS FISCALES": {
"IMPUESTO A LAS GANANCIAS": {
"Impuesto Ganancia Mi\u0301nima Presunta a": {
"account_number": "2.1.3.03.01"
},
"Impuesto a las Ganancias a Pagar": {
"account_number": "2.1.3.03.02"
},
"Pasivo por Impuesto Diferido": {
"account_number": "2.1.3.03.03"
},
"Percepciones y Retenciones efectuadas": {
"account_number": "2.1.3.03.04"
},
"account_number": "2.1.3.03.00"
},
"IMPUESTO AL VALOR AGREGADO": {
"IVA De\u0301bito Fiscal": {
"account_number": "2.1.3.01.01"
},
"IVA De\u0301bito Fiscal Sobretasa": {
"account_number": "2.1.3.01.02"
},
"IVA a Pagar": {
"account_number": "2.1.3.01.04"
},
"Percepciones y Retenciones efectuadas": {
"account_number": "2.1.3.01.03"
},
"account_number": "2.1.3.01.00"
},
"INGRESOS BRUTOS": {
"Impuesto a los Ingresos Brutos a Pagar": {
"account_number": "2.1.3.02.01"
},
"Percepciones efectuadas Ingresos": {
"account_number": "2.1.3.02.02"
},
"account_number": "2.1.3.02.00"
},
"account_number": "2.1.3.00.00"
},
"DEUDAS COMERCIALES CORRIENTES": {
"ACREEDORES": {
"Acreedores Locales (Ctes.)": {
"account_number": "2.1.1.02.01",
"account_type": "Payable"
},
"account_number": "2.1.1.02.00"
},
"account_number": "2.1.1.00.00"
},
"DEUDAS FINANCIERAS": {
"Pre\u0301stamo Banco de la Nacio\u0301n Argentina (Cte.)": {
"account_number": "2.1.4.01.00"
},
"Pre\u0301stamo Banco de la Provincia de Bs. As.": {
"account_number": "2.1.4.02.00"
},
"account_number": "2.1.4.00.00"
},
"INVENTARIOS POR PAGAR": {
"Inventario entrante no facturado": {
"account_number": "2.1.7.01.00",
"account_type": "Stock Received But Not Billed"
},
"account_number": "2.1.7.00.00"
},
"OTRAS DEUDAS CORRIENTES": {
"Dividendos a pagar (Ctes.)": {
"account_number": "2.1.5.01.00"
},
"Honorarios Directores a Pagar (Ctes.)": {
"account_number": "2.1.5.02.00"
},
"account_number": "2.1.5.00.00"
},
"PROVISIONES": {
"Provisio\u0301n para SAC": {
"account_number": "2.1.6.02.00"
},
"Provisio\u0301n para despidos": {
"account_number": "2.1.6.01.00"
},
"account_number": "2.1.6.00.00"
},
"REMUNERACIONES Y CAGAS SOCIALES": {
"DEUDAS PREVISIONALES": {
"ART a pagar": {
"account_number": "2.1.2.02.02"
},
"Jubilaciones a pagar": {
"account_number": "2.1.2.02.01"
},
"Obra Social a pagar": {
"account_number": "2.1.2.02.03"
},
"SAC a pagar": {
"account_number": "2.1.2.02.04"
},
"Vacaciones a pagar": {
"account_number": "2.1.2.02.05"
},
"account_number": "2.1.2.02.00"
},
"Sueldos y Jornales a pagar": {
"account_number": "2.1.2.03.00",
"account_type": "Chargeable"
},
"account_number": "2.1.2.00.00"
},
"account_number": "2.1.0.00.00"
},
"PASIVO NO CORRIENTE": {
"CARGAS FISCALES NO CORRIENTES": {
"Moratoria": {
"account_number": "2.2.2.01.00"
},
"account_number": "2.2.2.00.00"
},
"DEUDAS COMERCIALES": {
"ACREEDORES": {
"Acreedores Locales (No Ctes.)": {
"account_number": "2.2.3.01.01"
},
"account_number": "2.2.3.01.00"
},
"account_number": "2.2.3.00.00"
},
"DEUDAS FINANCIERAS NO CORRIENTES": {
"Pre\u0301stamo Banco de la Nacio\u0301n Argentina(ejemplo) (No": {
"account_number": "2.2.1.01.00"
},
"account_number": "2.2.1.00.00"
},
"OTRAS DEUDAS NO CORRIENTES": {
"account_number": "2.2.4.00.00",
"is_group": 1
},
"account_number": "2.2.0.00.00"
},
"account_number": "2.0.0.00.00",
"root_type": "Liability"
},
"PATRIMONIO NETO": {
"APORTE DE LOS PROPIETARIOS": {
"CAPITAL SOCIAL": {
"Acciones a distribuir": {
"account_number": "3.1.1.03.00"
},
"Acciones en Circulacio\u0301n": {
"account_number": "3.1.1.01.00"
},
"Ajuste del Capital": {
"account_number": "3.1.1.05.00"
},
"Aportes Irrevocables": {
"account_number": "3.1.1.02.00"
},
"Capital": {
"account_number": "3.1.1.04.00"
},
"account_number": "3.1.1.00.00"
},
"account_number": "3.1.0.00.00"
},
"RESERVAS": {
"Ajuste Reserva Legal": {
"account_number": "3.3.4.00.00"
},
"Reserva Estatutaria": {
"account_number": "3.3.3.00.00"
},
"Reserva Facultativa": {
"account_number": "3.3.2.00.00"
},
"Reserva Legal": {
"account_number": "3.3.1.00.00"
},
"account_number": "3.3.0.00.00"
},
"RESULTADOS ACUMULADOS": {
"A.R.E.A (G)": {
"account_number": "3.4.4.00.00"
},
"A.R.E.A (P)": {
"account_number": "3.4.3.00.00"
},
"Resultado Ejercicios Anteriores": {
"account_number": "3.4.2.00.00"
},
"Resultado del Ejercicio": {
"account_number": "3.4.1.00.00"
},
"account_number": "3.4.0.00.00"
},
"account_number": "3.0.0.00.00",
"root_type": "Equity"
}
}
}

View File

@@ -49,6 +49,10 @@
"is_group": 1
},
"ESTOQUES": {
"All Warehouses": {
"account_type": "Stock",
"is_group": 1
},
"Constru\u00e7\u00f5es em Andamento de Im\u00f3veis Destinados \u00e0 Venda": {},
"Estoques Destinados \u00e0 Doa\u00e7\u00e3o": {},
"Im\u00f3veis Destinados \u00e0 Venda": {},

View File

@@ -1,6 +1,6 @@
{
"country_code": "de",
"name": "Germany - Kontenplan SKR04",
"name": "SKR04 ohne Kontonummern",
"tree": {
"Bilanz - Aktiva": {
"Anlageverm\u00f6gen": {
@@ -176,7 +176,7 @@
"Eingeforderte Nachsch\u00fcsse (gegenkonto 2929)": {}
},
"Eingeforderte- noch ausstehende Kapitaleinlagen": {
"Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)": {}
"Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert": {}
},
"Forderungen aus Lieferungen und Leistungen H-Saldo": {
"Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr": {},
@@ -685,7 +685,6 @@
"Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {},
"Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {},
"Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {},
"Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer": {},
"Umsatzsteuer fr\u00fchere Jahre": {},
"Umsatzsteuer laufendes Jahr": {},
"Umsatzsteuer nach \u00a713b UStG": {},
@@ -747,7 +746,7 @@
"Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
"Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248": {}
},
"Verbindlichkeiten gegen\u00fcber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
"Verbindlichkeiten gegen\u00fcber Kreditinstituten - Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
"Verbindlichkeiten gegen\u00fcber Kreditinstituten 1": {
"(frei- in Bilanz kein Restlaufzeit vermerkt) 1": {},
"Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit 1 bis 5 Jahre": {},
@@ -778,8 +777,8 @@
},
"Gewinn u. Verlust - Aufwendungen": {
"Betriebliche Aufwendungen": {
"Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
"Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
"Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
"Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
"Abschreibungen auf Umlaufverm\u00f6gen- steuerrechtlich bedingt (soweit un\u00fcblich hoch)": {},
"Abschreibungen auf Verm\u00f6gensgegenst\u00e4nde des Umlaufverm\u00f6gens (soweit un\u00fcblich hoch)": {},
"Forderungsverluste (soweit un\u00fcblich hoch)": {},
@@ -852,7 +851,7 @@
"Sonstige betriebliche Aufwendungen 3": {
"Sonstige betriebliche Aufwendungen 4": {
"Abgaben f\u00fcr betrieblich genutzten Grundbesitz": {},
"Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
"Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach": {},
"Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
"Abschluss- und Pr\u00fcfungskosten": {},
"Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV (\u00fcbliche H\u00f6he)": {},
@@ -867,7 +866,7 @@
"Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.)": {},
"Aufwendungen aus Bewertung Finanzmittelfonds": {},
"Aufwendungen aus Kursdifferenzen": {},
"Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {},
"Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten R\u00fcckstellungen": {},
"Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten": {},
"Aufwendungen f\u00fcr Abraum- und Abfallbeseitigung": {},
@@ -987,9 +986,9 @@
"Verg\u00fctungen an Mitunternehmer \u00a7 15 EStG": {},
"Verkaufsprovisionen": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50% nicht anzugsf\u00e4hig (inlandische Kap. Ges.)": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100%/50% nicht anzugsf\u00e4hig": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
"Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {},
"Verpackungsmaterial": {},
"Versicherungen": {},
"Versicherungen f\u00fcr Geb\u00e4ude": {},
@@ -1020,10 +1019,10 @@
},
"Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften": {},
"Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig": {},
"Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {},
"Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens": {},
"Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig": {},
"Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
},
"account_type": "Depreciation"
@@ -1123,15 +1122,15 @@
}
},
"Erh\u00f6hung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen": {
"Erh\u00f6hung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
"Erh\u00f6hung / Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
"Bestandsver\u00e4nderungen - fertige Erzeugnisse": {},
"Bestandsver\u00e4nderungen - unfertige Erzeugnisse": {},
"Bestandsver\u00e4nderungen - unfertige Leistungen": {}
},
"Erh\u00f6hung des Bestands in Arbeit befindlicher Auftr\u00e4ge oder Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
"Erh\u00f6hung / Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
"Bestandsver\u00e4nderungen in Arbeit befindlicher Auftr\u00e4ge": {}
},
"Erh\u00f6hung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge oder Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauauftr\u00e4ge": {
"Erh\u00f6hung / Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge": {
"Bestandsver\u00e4nderungen in Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
}
},
@@ -1384,8 +1383,7 @@
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 1": {
"Diskontertr\u00e4ge": {},
"Diskontertr\u00e4ge aus verbundenen Unternehmen": {},
"Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Umlaufverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
"Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
"Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {},
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 2": {},
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {},
"Sonstige Zinsertr\u00e4ge": {},
@@ -1704,4 +1702,4 @@
"root_type": "Asset"
}
}
}
}

View File

@@ -0,0 +1,809 @@
{
"country_code": "sv",
"name": "El Salvador Standard",
"tree": {
"100000 - ACTIVOS - xmC": {
"11000000 - ACTIVOS CORRIENTES - xmC": {
"11010000 - EFECTIVO Y EQUIVALENTES AL EFECTIVO - xmC": {
"11010100 - Caja general - xmC": {
"account_number": "11010100",
"account_type": "Cash"
},
"Caja chica": {
"account_number": "11010200",
"account_type": "Cash",
"is_group": 1
},
"Efectivo en bancos": {
"account_number": "11010300",
"account_type": "Bank",
"is_group": 1
},
"account_number": "11010000",
"account_type": "Cash"
},
"CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS": {
"Arrendamientos financieros por cobrar": {
"account_number": "11040100",
"is_group": 1
},
"Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
"account_number": "11040200",
"is_group": 1
},
"account_number": "11040000"
},
"DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR": {
"11030100 - Deudores comerciales - xmC": {
"account_number": "11030100",
"account_type": "Receivable"
},
"Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
"account_number": "11030200",
"account_type": "Receivable",
"is_group": 1
},
"Otras cuentas por cobrar no comerciales": {
"account_number": "11030300",
"account_type": "Receivable",
"is_group": 1
},
"account_number": "11030000",
"account_type": "Receivable"
},
"GASTOS PAGADOS POR ANTICIPADO": {
"Adelantos a empleados": {
"account_number": "110904",
"account_type": "Temporary",
"is_group": 1
},
"Papeler\u00eda y \u00fatiles en existencia": {
"account_number": "11090300",
"account_type": "Temporary",
"is_group": 1
},
"Primas de seguros aun no vendidas": {
"account_number": "11090100",
"account_type": "Temporary",
"is_group": 1
},
"Rentas aun no corridas por los inmuebles": {
"account_number": "11090200",
"account_type": "Temporary",
"is_group": 1
},
"account_number": "11090000",
"account_type": "Temporary"
},
"INVENTARIOS": {
"11050100 - Inventarios en bodega al costo - xmC": {
"account_number": "11050100",
"account_type": "Stock"
},
"11050300 - Pedidos en transito - xmC": {
"account_number": "11050300",
"account_type": "Stock Received But Not Billed"
},
"Estimaci\u00f3n para obsolescencia de inventarios o de lento movimiento (CR)": {
"account_number": "11050200",
"account_type": "Stock",
"is_group": 1
},
"Mercader\u00edas en consignaci\u00f3n": {
"account_number": "11050400",
"account_type": "Stock",
"is_group": 1
},
"account_number": "11050000",
"account_type": "Stock"
},
"INVERSIONES TEMPORALES": {
"Acciones": {
"account_number": "11020100",
"account_type": "Temporary",
"is_group": 1
},
"Bonos": {
"account_number": "11020200",
"account_type": "Temporary",
"is_group": 1
},
"C\u00e9dulas hipotecarias": {
"account_number": "11020300",
"account_type": "Temporary",
"is_group": 1
},
"account_number": "11020000",
"account_type": "Temporary"
},
"IVA CREDITO FISCAL": {
"IVA compras locales": {
"account_number": "11060100",
"account_type": "Tax",
"is_group": 1,
"tax_rate": 13.0
},
"IVA importaciones": {
"account_number": "11060200",
"account_type": "Tax",
"is_group": 1,
"tax_rate": 13.0
},
"account_number": "11060000",
"account_type": "Tax",
"tax_rate": 13.0
},
"IVA PERCIBIDO": {
"account_number": "IVA PERCIBIDO",
"account_type": "Tax",
"is_group": 1,
"tax_rate": 1.0
},
"IVA RETENIDO": {
"account_number": "11070000",
"account_type": "Tax",
"is_group": 1,
"tax_rate": 1.0
},
"account_number": "11000000"
},
"12000000 - ACTIVOS NO CORRIENTES - xmC": {
"ACTIVOS INTANGIBLES": {
"Concesiones y franquicias": {
"account_number": "12080300",
"account_type": "Fixed Asset",
"is_group": 1
},
"Derechos de llave": {
"account_number": "12080100",
"account_type": "Fixed Asset",
"is_group": 1
},
"Patentes y marcas de fabrica": {
"account_number": "12080200",
"account_type": "Fixed Asset",
"is_group": 1
},
"Software": {
"account_number": "12080400",
"account_type": "Fixed Asset",
"is_group": 1
},
"account_number": "12080000",
"account_type": "Fixed Asset"
},
"CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
"Arrendamientos financieros por cobrar a largo plazo": {
"account_number": "12060100",
"account_type": "Receivable",
"is_group": 1
},
"Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
"account_number": "12060200",
"account_type": "Receivable",
"is_group": 1
},
"account_number": "12060000",
"account_type": "Receivable"
},
"DEPRECIACION ACUMULUDA (CR)": {
"12030100 - Deprec. acumulada de propiedades, planta y equipo propio al costo - xmC": {
"account_number": "12030100",
"account_type": "Accumulated Depreciation"
},
"Deprec. acumulada de prop., planta y equipo bajo arrend. Financiero": {
"account_number": "12030200",
"account_type": "Accumulated Depreciation",
"is_group": 1
},
"Deprec. acumulada de revaluaos de propiedades, planta y equipo": {
"account_number": "12030300",
"account_type": "Accumulated Depreciation",
"is_group": 1
},
"account_number": "12030000",
"account_type": "Accumulated Depreciation"
},
"DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR A LARGO PLAZO": {
"12050100 - Deudores comerciales a largo plazo - xmC": {
"account_number": "12050100",
"account_type": "Receivable",
"is_group": 1
},
"Cuentas por cobrar no comerciales a largo plazo": {
"account_number": "12050300",
"account_type": "Receivable",
"is_group": 1
},
"Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
"account_number": "12050200",
"account_type": "Receivable",
"is_group": 1
},
"account_number": "12050000",
"account_type": "Receivable"
},
"IMPUESTO SOBRE LA RENTA DIFERIDO-ACTIVO": {
"12070200 - Pago anticipados de impuestos sobre la renta - xmC": {
"account_number": "12070200",
"account_type": "Temporary",
"is_group": 1
},
"Cr\u00e9dito impuestos sobre la renta de a\u00f1os anteriores": {
"account_number": "12070100",
"account_type": "Tax",
"is_group": 1
},
"account_number": "12070000",
"account_type": "Tax"
},
"INVERSIONES PERMANENTES": {
"Inversiones en asociadas": {
"account_number": "12040200",
"account_type": "Fixed Asset",
"is_group": 1
},
"Inversiones en negocios conjuntos": {
"account_number": "12040300",
"account_type": "Fixed Asset",
"is_group": 1
},
"Inversiones en subsidiarias": {
"account_number": "12040100",
"account_type": "Fixed Asset",
"is_group": 1
},
"account_number": "12040000",
"account_type": "Fixed Asset"
},
"PROPIEDADES, PLANTA Y EQUIPO": {
"12010300 - Maquinarias y equipos - xmC": {
"account_number": "12010300",
"account_type": "Fixed Asset"
},
"Edificios": {
"account_number": "12010200",
"account_type": "Fixed Asset",
"is_group": 1
},
"Mobiliario y equipo": {
"account_number": "12010400",
"account_type": "Fixed Asset",
"is_group": 1
},
"Terrenos": {
"account_number": "12010100",
"account_type": "Fixed Asset",
"is_group": 1
},
"Veh\u00edculos": {
"account_number": "12010500",
"account_type": "Fixed Asset",
"is_group": 1
},
"account_number": "12010000",
"account_type": "Fixed Asset"
},
"REVALUACIONES DE PROPIEDADES, PLANTA Y EQUIPO": {
"Revaluaci\u00f3n de edificios": {
"account_number": "12020200",
"account_type": "Fixed Asset",
"is_group": 1
},
"Revaluaci\u00f3n de maquinarias y equipo": {
"account_number": "12020300",
"account_type": "Fixed Asset",
"is_group": 1
},
"Revaluaci\u00f3n de mobiliario y equipo": {
"account_number": "12020400",
"account_type": "Fixed Asset",
"is_group": 1
},
"Revaluaci\u00f3n de terrenos": {
"account_number": "12020100",
"account_type": "Fixed Asset",
"is_group": 1
},
"Revaluaci\u00f3n de veh\u00edculos": {
"account_number": "12020500",
"account_type": "Fixed Asset",
"is_group": 1
},
"account_number": "12020000",
"account_type": "Fixed Asset"
},
"account_number": "12000000",
"account_type": "Fixed Asset"
},
"account_number": "100000",
"root_type": "Asset"
},
"20000000 - PASIVOS - xmC": {
"PASIVOS CORRIENTES": {
"ACREEDORES COMERCIALES Y OTRAS CUENTAS POR PAGAR": {
"21020100 - Cuentas por pagar comerciales - xmC": {
"account_number": "21020100",
"account_type": "Payable"
},
"Documentos por pagar comerciales": {
"account_number": "21020200",
"account_type": "Payable",
"is_group": 1
},
"account_number": "21020000",
"account_type": "Payable"
},
"BENEFICIOS A EMPLEADOS POR PAGAR": {
"Beneficios a corto plazo por pagar": {
"account_number": "21050100",
"account_type": "Payable",
"is_group": 1
},
"Beneficios post empleo por pagar": {
"account_number": "21050200",
"account_type": "Payable",
"is_group": 1
},
"account_number": "21050000",
"account_type": "Payable"
},
"DIVIDENDOS POR PAGAR": {
"account_number": "21080000",
"account_type": "Payable",
"is_group": 1
},
"IMPUESTO SOBRE LA RENTA CORRIENTE POR PAGAR": {
"account_number": "21070000",
"account_type": "Tax",
"is_group": 1
},
"IVA DEBITOS FISCALES": {
"Por ventas a consumidores": {
"account_number": "21060200",
"account_type": "Tax",
"is_group": 1
},
"Por ventas a contribuyentes": {
"account_number": "21060100",
"account_type": "Tax",
"is_group": 1
},
"account_number": "21060000",
"account_type": "Tax"
},
"OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS PORCION CORRIENTE": {
"Contratos bajo arrendamientos financieros": {
"account_number": "21030100",
"account_type": "Payable",
"is_group": 1
},
"account_number": "21030000",
"account_type": "Payable"
},
"OTROS ACREEDORES, RETENCIONES Y DESCUENTOS": {
"Cuentas por pagar a accionistas": {
"account_number": "21040400",
"account_type": "Payable",
"is_group": 1
},
"Descuentos": {
"account_number": "21040300",
"account_type": "Payable",
"is_group": 1
},
"Otros acreedores": {
"account_number": "21040100",
"account_type": "Payable",
"is_group": 1
},
"Retenciones": {
"account_number": "21040200",
"account_type": "Payable",
"is_group": 1
},
"account_number": "21040000",
"account_type": "Payable"
},
"PRESTAMOS Y SOBREGIROS BANCARIOS": {
"Porci\u00f3n corriente de prestamos bancarios a largo plazo": {
"account_number": "21010300",
"is_group": 1
},
"Prestamos bancarios a corto plazo": {
"account_number": "21010100",
"is_group": 1
},
"Sobregiros bancarios": {
"account_number": "21010200",
"is_group": 1
},
"account_number": "21010000"
},
"account_number": "21000000"
},
"PASIVOS NO CORRIENTES": {
"ANTICIPOS Y GARANTIAS DE CLIENTES": {
"Anticipos de clientes": {
"account_number": "22040100",
"account_type": "Temporary",
"is_group": 1
},
"Garant\u00edas de clientes": {
"account_number": "22040200",
"account_type": "Temporary",
"is_group": 1
},
"account_number": "22040000",
"account_type": "Temporary"
},
"INTERES MINOTARIO": {
"Inter\u00e9s de accionista minotarios": {
"account_number": "22050100",
"is_group": 1
},
"account_number": "22050000"
},
"OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
"Contratos bajo arrendamientos financieros": {
"account_number": "22030100",
"is_group": 1
},
"account_number": "22030000"
},
"OTROS PRESTAMOS A LARGO PLAZO": {
"account_number": "22020000",
"is_group": 1
},
"PRESTAMOS BANCARIOS A LARGO PLAZO": {
"account_number": "22010000",
"is_group": 1
},
"account_number": "22000000"
},
"PROVISIONES": {
"IMPUESTOS SOBRE LA RENTA COMPLEMENTARIO": {
"Ejercicios anteriores": {
"account_number": "23010100",
"account_type": "Tax",
"is_group": 1
},
"account_number": "23010000",
"account_type": "Tax"
},
"PROVISION PARA OBLIGACIONES LABORALES": {
"Indemnizaci\u00f3n": {
"account_number": "23020100",
"is_group": 1
},
"account_number": "23020000"
},
"account_number": "23000000"
},
"account_number": "20000000",
"root_type": "Liability"
},
"30000000 - PATRIMONIO - xmC": {
"CAPITAL, RESERVAS Y RESULTADOS": {
"CAPITAL SOCIAL": {
"Capital Social M\u00ednimo": {
"Capital Social M\u00ednimo NO Pagado": {
"account_number": "31010102",
"account_type": "Equity",
"is_group": 1
},
"Capital Social M\u00ednimo Suscrito": {
"account_number": "31010101",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31010100",
"account_type": "Equity"
},
"Capital Social Variable": {
"Capital Social Variable NO Pagado": {
"account_number": "31010202",
"account_type": "Equity",
"is_group": 1
},
"Capital Social Variable Suscrito": {
"account_number": "31010201",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31010200",
"account_type": "Equity"
},
"account_number": "31010000",
"account_type": "Equity"
},
"DIVIDENDOS PAGADOS": {
"account_number": "31060000",
"account_type": "Equity",
"is_group": 1
},
"GANANCIAS NO DISTRIBUIDAS": {
"De ejercicios anteriores": {
"account_number": "31020100",
"account_type": "Equity",
"is_group": 1
},
"Del presente ejercicio": {
"account_number": "31020200",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31020000",
"account_type": "Equity"
},
"GANANCIAS RESTRINGIDAS": {
"Reserva legal": {
"account_number": "31030100",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31030000",
"account_type": "Equity"
},
"PERDIDAS ACUMULADAS (CR)": {
"De ejercicios anteriores": {
"account_number": "31050100",
"account_type": "Equity",
"is_group": 1
},
"Del presente ejercicio": {
"account_number": "31050200",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31050000",
"account_type": "Equity"
},
"SUPERAVIT POR REVALUACIONES": {
"Super\u00e1vit por revaluaci\u00f3n de activos": {
"account_number": "31040100",
"account_type": "Equity",
"is_group": 1
},
"account_number": "31040000",
"account_type": "Equity"
},
"account_number": "31000000",
"account_type": "Equity"
},
"account_number": "30000000",
"root_type": "Equity"
},
"40000000 - CUENTAS DE RESULTADO DEUDORAS - xmC": {
"COSTOS Y GASTOS DE OPERACI\u00d3N": {
"41010000 - COSTO DE LAS VENTAS - xmC": {
"account_number": "41010000",
"account_type": "Cost of Goods Sold"
},
"GASTOS DE DEPARTAMENTO DE OPERACIONES": {
"41020600 - Depreciaciones y amortizaciones - xmC": {
"account_number": "41020600",
"account_type": "Depreciation"
},
"41020900 - Redondeos - xmC": {
"account_number": "41020900",
"account_type": "Round Off"
},
"Gastos operativos": {
"account_number": "41020700",
"account_type": "Chargeable",
"is_group": 1
},
"Mantenimientos": {
"account_number": "41020400",
"account_type": "Chargeable",
"is_group": 1
},
"Materiales y suministros": {
"Ajustes de Inventario": {
"account_number": "41020201",
"account_type": "Stock Adjustment"
},
"account_number": "41020200",
"account_type": "Chargeable"
},
"Seguros": {
"account_number": "41020500",
"account_type": "Chargeable",
"is_group": 1
},
"Servicios b\u00e1sicos": {
"account_number": "41020300",
"account_type": "Chargeable",
"is_group": 1
},
"Servicios y honorarios profesionales": {
"account_number": "41020800",
"account_type": "Chargeable",
"is_group": 1
},
"Sueldos y prestaciones laborales": {
"account_number": "41020100",
"account_type": "Chargeable",
"is_group": 1
},
"account_number": "41020000",
"account_type": "Expense Account"
},
"GASTOS DE VENTAS Y DISTRIBUCION": {
"Depreciaciones y amortizaciones": {
"account_number": "41030600",
"account_type": "Chargeable",
"is_group": 1
},
"Gastos operativos": {
"account_number": "41030700",
"account_type": "Chargeable",
"is_group": 1
},
"Mantenimientos": {
"account_number": "41030400",
"account_type": "Chargeable",
"is_group": 1
},
"Materiales y suministros": {
"account_number": "41030200",
"account_type": "Chargeable",
"is_group": 1
},
"Seguros": {
"account_number": "41030500",
"account_type": "Chargeable",
"is_group": 1
},
"Servicios b\u00e1sicos": {
"account_number": "41030300",
"account_type": "Chargeable",
"is_group": 1
},
"Servicios y honorarios profesionales": {
"account_number": "41030800",
"account_type": "Chargeable",
"is_group": 1
},
"Sueldos y prestaciones laborales": {
"account_number": "41030100",
"account_type": "Chargeable",
"is_group": 1
},
"account_number": "41030000",
"account_type": "Expense Account"
},
"account_number": "41000000",
"account_type": "Expense Account"
},
"GASTOS DE IMPUESTO SOBRE LA RENTA": {
"GASTOS DE IMPUESTO SOBRE LA RENTA CORRIENTE": {
"account_number": "43010000",
"account_type": "Expense Account",
"is_group": 1
},
"account_number": "43000000",
"account_type": "Expense Account"
},
"GASTOS DE NO OPERACI\u00d3N": {
"42020000 - GASTOS NO DEDUCIBLES - xmC": {
"Garant\u00eda por venta de productos": {
"account_number": "42020200",
"account_type": "Expense Account",
"is_group": 1
},
"Impuesto sobre la renta complementario": {
"account_number": "42020100",
"account_type": "Tax",
"is_group": 1
},
"account_number": "42020000",
"account_type": "Expense Account"
},
"GASTOS FINANCIEROS": {
"42010100 - Intereses - xmC": {
"account_number": "42010100",
"account_type": "Expense Account",
"is_group": 1
},
"42010300 - Diferenciales cambiarios - xmC": {
"account_number": "42010300",
"account_type": "Expense Account",
"is_group": 1
},
"Comisiones bancarias": {
"account_number": "42010200",
"account_type": "Expense Account",
"is_group": 1
},
"account_number": "42010000",
"account_type": "Expense Account"
},
"account_number": "42000000",
"account_type": "Expense Account"
},
"account_number": "40000000",
"root_type": "Expense"
},
"50000000 - CUENTAS DE RESULTADO ACREEDORAS - xmC": {
"INGRESOS DE NO OPERACI\u00d3N": {
"DIVIDENDOS GANADOS": {
"Dividendos devengados por inversiones": {
"account_number": "52020100",
"account_type": "Income Account",
"is_group": 1
},
"account_number": "52020000",
"account_type": "Income Account"
},
"INGRESOS FINANCIEROS": {
"Comisiones": {
"account_number": "52010200",
"account_type": "Income Account",
"is_group": 1
},
"Diferenciales cambiarios": {
"account_number": "52010300",
"account_type": "Income Account",
"is_group": 1
},
"Intereses": {
"account_number": "52010100",
"account_type": "Income Account",
"is_group": 1
},
"account_number": "52010000",
"account_type": "Income Account"
},
"OTROS INGRESOS": {
"Ingresos por activos dados en arrendamientos financieros": {
"account_number": "52030200",
"account_type": "Income Account",
"is_group": 1
},
"Ingresos por conversi\u00f3n": {
"account_number": "52030100",
"account_type": "Income Account",
"is_group": 1
},
"Reintegros de seguros": {
"account_number": "52030300",
"account_type": "Income Account",
"is_group": 1
},
"account_number": "52030000",
"account_type": "Income Account"
},
"account_number": "52000000",
"account_type": "Income Account"
},
"INGRESOS POR OPERACIONES CONTINUAS": {
"51010000 - VENTAS DE BIENES - xmC": {
"account_number": "51010000",
"account_type": "Income Account"
},
"VENTAS DE SERVICIOS": {
"account_number": "51020000",
"account_type": "Income Account",
"is_group": 1
},
"account_number": "51000000",
"account_type": "Income Account"
},
"account_number": "50000000",
"root_type": "Income"
},
"60000000 - CUENTA LIQUIDADORA DE RESULTADOS - xmC": {
"CUENTA DE CIERRE": {
"PERDIDAS Y GANANCIAS": {
"account_number": "61010000",
"is_group": 1
},
"account_number": "61000000"
},
"account_number": "60000000",
"root_type": "Income"
}
}
}

View File

@@ -1,100 +0,0 @@
{
"country_code": "fr",
"name": "France - Chart of Accounts",
"tree": {
"Frais": {
"601 achats stock\u00e9s, mat premi\u00e8res": {
"account_type": "Cost of Goods Sold"
},
"6031 variation des stock\u00e9s mat premi\u00e8res": {
"account_type": "Stock Adjustment"
},
"6081 frais accessoires d'achats mat premi\u00e8res": {
"account_type": "Expenses Included In Valuation"
},
"Dotations aux amortissements, d\u00e9pr\u00e9ciations": {
"account_type": "Depreciation"
},
"root_type": "Expense"
},
"le revenu": {
"701 ventes de produits finis": {},
"root_type": "Income"
},
"les atouts": {
"Amortissements des immobilisations corporelles ": {
"Autres immobilisations corporelles (m\u00eame ventilation que celle du compte 218)": {
"account_type": "Accumulated Depreciation"
},
"Constructions (m\u00eame ventilation que celle du compte 213) ": {
"account_type": "Accumulated Depreciation"
},
"Installations mat\u00e9riel et outillage industriels (m\u00eame ventilation que celle du compte 215)": {
"account_type": "Accumulated Depreciation"
},
"account_type": "Accumulated Depreciation"
},
"Banques": {
"51201 Soci\u00e9t\u00e9 g\u00e9n\u00e9rale": {
"account_type": "Bank"
},
"account_type": "Bank"
},
"Caisse": {
"5301 Caisse si\u00e8ge social": {
"account_type": "Cash"
},
"account_type": "Cash"
},
"Clients et comptes rattach\u00e9s": {
"41119 Autres Clients": {
"account_type": "Receivable"
},
"account_type": "Receivable"
},
"Immobilisations corporelles en cours": {
"Autres immobilisations corporelles": {
"account_type": "Fixed Asset"
},
"Constructions": {
"account_type": "Fixed Asset"
},
"Installations techniques mat\u00e9riel et outillage industriels ": {
"account_type": "Fixed Asset"
},
"account_type": "Fixed Asset"
},
"Stock": {
"Stock in Hand": {
"account_type": "Stock"
}
},
"root_type": "Asset"
},
"passifs": {
"Fournisseurs - Factures non parvenues ": {
"4081 Fournisseurs - Factures non parvenues ": {
"account_type": "Stock Received But Not Billed"
},
"account_type": "Stock Received But Not Billed"
},
"Fournisseurs et comptes rattach\u00e9s": {
"4011 Fournisseurs - Achats de biens et prestations de services": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"root_type": "Liability",
"\u00c9tat - Taxes sur le chiffre d'affaires": {
"TVA collect\u00e9e (Taux Normal)": {
"account_type": "Tax"
},
"account_type": "Tax"
}
},
"\u00c9quit\u00e9": {
"is_group": 1,
"root_type": "Equity"
}
}
}

View File

@@ -2,7 +2,394 @@
"country_code": "gt",
"name": "Guatemala - Cuentas",
"tree": {
"02 - Pasivos": {
"Activos": {
"Activo Corriente": {
"Activos Biol\u00f3gicos": {
"Activos Biol\u00f3gicos a Valor Razonable": {
"Animales": {
"account_number": "1.5.2.1",
"account_type": "Stock",
"is_group": 1
},
"Plantas": {
"account_number": "1.5.2.2",
"account_type": "Stock",
"is_group": 1
},
"account_number": "1.5.2",
"account_type": "Stock"
},
"Activos Biol\u00f3gicos al Costo": {
"account_number": "1.5.1",
"account_type": "Stock",
"is_group": 1
},
"account_number": "1.5",
"account_type": "Stock"
},
"Activos Corrientes Adicionales": {
"Activos Diferidos o Restringidos": {
"Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
"account_number": "1.1.2.1",
"account_type": "Chargeable",
"is_group": 1
},
"account_number": "1.1.2",
"account_type": "Chargeable"
},
"Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {
"account_number": "1.1.1"
},
"account_number": "1.1",
"account_type": "Chargeable"
},
"Activos Devengables y Otros Activos": {
"Activos Adicionales y Otros": {
"account_number": "1.6.6",
"account_type": "Chargeable",
"is_group": 1
},
"Cobrables Relacionados con Impuestos": {
"account_number": "1.6.2",
"account_type": "Chargeable",
"is_group": 1
},
"Contratos de Construccion": {
"account_number": "1.6.4",
"account_type": "Chargeable",
"is_group": 1
},
"Costos de Montaje": {
"account_number": "1.6.5",
"account_type": "Chargeable",
"is_group": 1
},
"Pagos Anticipados y Otros Activos Circulantes": {
"Seguro Pagado Anticipadamente": {
"account_number": "1.6.1.0",
"account_type": "Chargeable"
},
"account_number": "1.6.1",
"account_type": "Chargeable"
},
"Proveedores de Servicio": {
"account_number": "1.6.3",
"account_type": "Chargeable",
"is_group": 1
},
"account_number": "1.6",
"account_type": "Chargeable"
},
"Activos Financieros": {
"Activos Financieros Clasificados por Designaci\u00f3n": {
"account_number": "1.4.6",
"account_type": "Chargeable",
"is_group": 1
},
"Activos Financieros Derivados": {
"account_number": "1.4.3",
"account_type": "Chargeable",
"is_group": 1
},
"Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
"account_number": "1.4.1",
"account_type": "Chargeable",
"is_group": 1
},
"Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
"account_number": "1.4.2",
"account_type": "Chargeable",
"is_group": 1
},
"Otros Activos Financieros": {
"account_number": "1.4.4",
"account_type": "Chargeable",
"is_group": 1
},
"Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
"account_number": "1.4.5",
"account_type": "Round Off",
"is_group": 1
},
"account_number": "1.4",
"account_type": "Chargeable"
},
"Activos Intangibles": {
"account_number": "1.3",
"account_type": "Chargeable",
"is_group": 1
},
"Caja y Equivalentes": {
"Caja": {
"account_number": "1.9.1",
"account_type": "Cash",
"is_group": 1
},
"Equivalentes de Efectivo (Bancos)": {
"Bancos Internacionales": {
"HSBC": {
"account_number": "1.9.2.2.1",
"account_type": "Bank"
},
"account_number": "1.9.2.2",
"account_type": "Bank"
},
"Bancos Nacionales": {
"Banco Agromercantil de Guatemala": {
"account_number": "1.9.2.1.2",
"account_type": "Bank"
},
"Banco G&T Continental": {
"account_number": "1.9.2.1.5",
"account_type": "Bank"
},
"Banco Industrial": {
"account_number": "1.9.2.1.1",
"account_type": "Bank",
"is_group": 1
},
"Banco Internacional": {
"account_number": "1.9.2.1.6",
"account_type": "Bank"
},
"Banco Prom\u00e9rica": {
"account_number": "1.9.2.1.3",
"account_type": "Bank"
},
"Banco de Am\u00e9rica Central": {
"account_number": "1.9.2.1.4",
"account_type": "Bank"
},
"Banco de Desarrollo Rural": {
"account_number": "1.9.2.1.7",
"account_type": "Bank"
},
"Banco de los Trabajadores": {
"account_number": "1.9.2.1.8",
"account_type": "Bank"
},
"Vivibanco": {
"account_number": "1.9.2.1.9",
"account_type": "Bank"
},
"account_number": "1.9.2.1",
"account_type": "Bank"
},
"Cadena de Bloques (Blockchain)": {
"Billetera Bitcoin 1234567890abcdefg": {
"account_number": "1.9.2.3.1",
"account_type": "Cash"
},
"account_number": "1.9.2.3",
"account_type": "Cash"
},
"account_number": "1.9.2",
"account_type": "Bank"
},
"Inversiones a Corto Plazo": {
"account_number": "1.9.3",
"account_type": "Bank",
"is_group": 1
},
"Otros Equivalentes de Caja y Bancos": {
"account_number": "1.9.4",
"account_type": "Cash",
"is_group": 1
},
"account_number": "1.9",
"account_type": "Bank"
},
"Cobrables": {
"Activos bajo Contrato": {
"account_number": "1.8.2",
"account_type": "Receivable",
"is_group": 1
},
"Ajustes": {
"account_number": "1.8.4",
"account_type": "Chargeable",
"is_group": 1
},
"Otras Cuentas por Cobrar": {
"Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
"Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
"account_number": "1.8.3.2.1",
"account_type": "Receivable"
},
"account_number": "1.8.3.2",
"account_type": "Receivable"
},
"Cuentas por Cobrar a Empleados": {
"Prestamo EJEMPLO": {
"account_number": "1.8.3.3.1",
"account_type": "Receivable"
},
"account_number": "1.8.3.3",
"account_type": "Receivable"
},
"Cuentas por Cobrar a Otras Entidades no Afiliadas": {
"Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
"account_number": "1.8.3.1.1",
"account_type": "Receivable"
},
"account_number": "1.8.3.1",
"account_type": "Receivable"
},
"account_number": "1.8.3",
"account_type": "Receivable"
},
"Ventas al Cr\u00e9dito": {
"account_number": "1.8.1",
"account_type": "Receivable",
"is_group": 1
},
"account_number": "1.8",
"account_type": "Receivable"
},
"Impuestos por Cobrar": {
"Retenciones de IVA recibidas": {}
},
"Inventario": {
"Art\u00edculos de Inventario Adicionales": {
"account_number": "1.7.8",
"account_type": "Stock",
"is_group": 1
},
"Combustibles": {
"account_number": "1.7.5",
"account_type": "Stock",
"is_group": 1
},
"Inventarios Pignorados Como Garant\u00eda de Pasivo": {
"account_number": "1.7.10",
"account_type": "Stock",
"is_group": 1
},
"Inventarios a Valor Razonable Menos Costos de Venta": {
"account_number": "1.7.11",
"account_type": "Stock",
"is_group": 1
},
"Materia Prima": {
"account_number": "1.7.1",
"account_type": "Stock",
"is_group": 1
},
"Mercader\u00eda (Mercanc\u00edas)": {
"account_number": "1.7.2",
"account_type": "Stock",
"is_group": 1
},
"Otros Inventarios": {
"Merma o Ajuste de Inventario": {
"account_number": "1.7.9.1",
"account_type": "Stock Adjustment",
"is_group": 1
},
"account_number": "1.7.9",
"account_type": "Stock"
},
"Producto Terminado": {
"account_number": "1.7.7",
"account_type": "Stock",
"is_group": 1
},
"Repuestos": {
"Respuestos en Transito": {
"account_number": "1.7.4.0",
"account_type": "Stock",
"is_group": 1
},
"account_number": "1.7.4",
"account_type": "Stock"
},
"Suministros de Producci\u00f3n y Consumibles": {
"account_number": "1.7.3",
"account_type": "Stock",
"is_group": 1
},
"Trabajo en Progeso": {
"account_number": "1.7.6",
"account_type": "Stock",
"is_group": 1
},
"account_number": "1.7",
"account_type": "Stock"
},
"Inversion en Propiedades": {
"Inversion Inmobiliaria Bajo Construccion": {
"account_number": "1.2.1",
"account_type": "Chargeable"
},
"Inversion Inmobiliaria Construida": {
"account_number": "1.2.2",
"account_type": "Chargeable",
"is_group": 1
},
"account_number": "1.2",
"account_type": "Chargeable"
},
"account_number": "1.0"
},
"No Corriente": {
"Activos Fijos": {
"account_type": "Fixed Asset"
},
"Cargos Diferidos": {}
},
"account_number": "1",
"root_type": "Asset"
},
"Costos": {
"Costo de Ventas": {
"account_type": "Cost of Goods Sold"
},
"Costos Incluidos en la Valuaci\u00f3n": {
"account_type": "Expenses Included In Valuation"
},
"Merma o Ajuste de Inventario": {
"account_type": "Stock Adjustment"
},
"account_number": "5",
"root_type": "Expense"
},
"Gastos": {
"Alquileres": {},
"Depreciaciones": {
"account_type": "Depreciation"
},
"Gastos Diversos": {},
"Gastos de Personal": {},
"Honorarios Profesionales": {},
"Mantenimiento": {},
"Seguros": {},
"Servicios B\u00e1sicos": {},
"account_number": "6",
"root_type": "Expense"
},
"Ingresos": {
"Productos": {},
"Servicios": {},
"account_number": "4",
"root_type": "Income"
},
"Otros Gastos y Productos Financieros": {
"Otros Gastos": {
"Otros Gastos y Productos Financieros 2": {
"Intereses 1": {},
"Otros Gastos Financieros 1": {}
}
},
"Otros Ingresos": {
"Otros Gastos y Productos Financieros 1": {
"Intereses": {},
"Otros Gastos Financieros": {}
}
},
"account_number": "7",
"root_type": "Expense"
},
"Pasivos": {
"Pasivo Corriente": {
"Acreedores 1": {
"account_type": "Payable"
@@ -22,329 +409,14 @@
"Acreedores": {},
"Provisi\u00f3n para Indemnizaciones": {}
},
"account_number": "2",
"root_type": "Liability"
},
"03 - Patrimonio": {
"Patrimonio": {
"Capital": {},
"Resultados del Ejercicio": {},
"Utilidades Retenidas": {},
"root_type": "Asset"
},
"04 - Ingresos": {
"Productos": {},
"Servicios": {},
"root_type": "Income"
},
"05 - Costos": {
"Costo de Ventas": {
"account_type": "Cost of Goods Sold"
},
"Costos Incluidos en la Valuaci\u00f3n": {
"account_type": "Expenses Included In Valuation"
},
"Merma o Ajuste de Inventario": {
"account_type": "Stock Adjustment"
},
"root_type": "Expense"
},
"06 - Gastos": {
"Alquileres": {},
"Depreciaciones": {
"account_type": "Depreciation"
},
"Gastos Diversos": {},
"Gastos de Personal": {},
"Honorarios Profesionales": {},
"Mantenimiento": {},
"Seguros": {},
"Servicios B\u00e1sicos": {},
"root_type": "Expense"
},
"07 - Otros Gastos y Productos Financieros": {
"Otros Gastos": {
"Otros Gastos y Productos Financieros 2": {
"Intereses 1": {},
"Otros Gastos Financieros 1": {}
}
},
"Otros Ingresos": {
"Otros Gastos y Productos Financieros 1": {
"Intereses": {},
"Otros Gastos Financieros": {}
}
},
"root_type": "Expense"
},
"1 - Activos": {
"1. Activo Corriente": {
"1.10 Activos Corrientes Adicionales": {
"1.10.1 Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {},
"1.10.2 Activos Diferidos o Restringidos": {
"1.10.2.1 Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
"account_type": "Chargeable",
"is_group": 1
},
"account_type": "Chargeable"
},
"account_type": "Chargeable"
},
"1.2 Inversion en Propiedades": {
"1.2.1 Inversion Inmobiliaria Bajo Construccion": {
"account_type": "Chargeable"
},
"1.2.2 Inversion Inmobiliaria Construida": {
"account_type": "Chargeable",
"is_group": 1
},
"account_type": "Chargeable"
},
"1.3 Activos Intangibles": {
"account_type": "Chargeable",
"is_group": 1
},
"1.4 Activos Financieros": {
"1.4.1 Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
"account_type": "Chargeable",
"is_group": 1
},
"1.4.2 Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
"account_type": "Chargeable",
"is_group": 1
},
"1.4.3 Activos Financieros Derivados": {
"account_type": "Chargeable",
"is_group": 1
},
"1.4.4 Otros Activos Financieros": {
"account_type": "Chargeable",
"is_group": 1
},
"1.4.5 Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
"account_type": "Round Off",
"is_group": 1
},
"1.4.6 Activos Financieros Clasificados por Designaci\u00f3n": {
"account_type": "Chargeable",
"is_group": 1
},
"account_type": "Chargeable"
},
"1.5 Activos Biol\u00f3gicos": {
"1.5.1 Activos Biol\u00f3gicos al Costo": {
"account_type": "Stock",
"is_group": 1
},
"1.5.2 Activos Biol\u00f3gicos a Valor Razonable": {
"1.5.2.1 Animales": {
"account_type": "Stock",
"is_group": 1
},
"1.5.2.2 Plantas": {
"1.5.2.2.1 Division productiva 1er nivel EJEMPLO": {
"1.5.2.2.1.1 Division Productiva 2do nivel EJEMPLO": {
"1.5.2.2.1.1.1 Division Productiva 3er Nivel EJEMPLO": {
"1.5.2.2.1.1.1.1 Divisi\u00f3n Productiva 4\u00ba Nivel EJEMPLO": {},
"account_type": "Stock"
},
"account_type": "Stock"
},
"account_type": "Stock"
},
"account_type": "Stock"
},
"account_type": "Stock"
},
"account_type": "Stock"
},
"1.6 Activos Devengables y Otros Activos": {
"1.6.1 Pagos Anticipados y Otros Activos Circulantes": {
"1.6.1.0 Seguro Pagado Anticipadamente": {
"account_type": "Chargeable"
},
"account_type": "Chargeable"
},
"1.6.2 Cobrables Relacionados con Impuestos": {
"account_type": "Chargeable",
"is_group": 1
},
"1.6.3 Proveedores de Servicio": {
"account_type": "Chargeable",
"is_group": 1
},
"1.6.4 Contratos de Construccion": {
"account_type": "Chargeable",
"is_group": 1
},
"1.6.5 Costos de Montaje": {
"account_type": "Chargeable",
"is_group": 1
},
"1.6.6 Activos Adicionales y Otros": {
"account_type": "Chargeable",
"is_group": 1
},
"account_type": "Chargeable"
},
"1.7 Inventario": {
"1.7.1 Materia Prima": {
"account_type": "Stock",
"is_group": 1
},
"1.7.10 Inventarios Pignorados Como Garant\u00eda de Pasivo": {
"account_type": "Stock",
"is_group": 1
},
"1.7.11 Inventarios a Valor Razonable Menos Costos de Venta": {
"account_type": "Stock",
"is_group": 1
},
"1.7.2 Mercader\u00eda (Mercanc\u00edas)": {
"account_type": "Stock",
"is_group": 1
},
"1.7.3 Suministros de Producci\u00f3n y Consumibles": {
"account_type": "Stock",
"is_group": 1
},
"1.7.4 Repuestos": {
"1.7.4.0 Respuestos en Transito": {
"account_type": "Stock",
"is_group": 1
},
"account_type": "Stock"
},
"1.7.5 Combustibles": {
"account_type": "Stock",
"is_group": 1
},
"1.7.6 Trabajo en Progeso": {
"account_type": "Stock",
"is_group": 1
},
"1.7.7 Producto Terminado": {
"account_type": "Stock",
"is_group": 1
},
"1.7.8 Art\u00edculos de Inventario Adicionales": {
"account_type": "Stock",
"is_group": 1
},
"1.7.9 Otros Inventarios": {
"1.7.9.1 Merma o Ajuste de Inventario": {
"account_type": "Stock Adjustment",
"is_group": 1
},
"account_type": "Stock"
},
"account_type": "Stock"
},
"1.8 Cobrables": {
"1.8.1 Ventas al Cr\u00e9dito": {
"account_type": "Receivable",
"is_group": 1
},
"1.8.2 Activos bajo Contrato": {
"account_type": "Receivable",
"is_group": 1
},
"1.8.3 Otras Cuentas por Cobrar": {
"1.8.3.1 Cuentas por Cobrar a Otras Entidades no Afiliadas": {
"1.8.3.1.1 Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
"account_type": "Receivable"
},
"account_type": "Receivable"
},
"1.8.3.2 Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
"1.8.3.2.1 Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
"account_type": "Receivable"
},
"account_type": "Receivable"
},
"1.8.3.3 Cuentas por Cobrar a Empleados": {
"1.8.3.3.1 Prestamo EJEMPLO": {
"account_type": "Receivable"
},
"account_type": "Receivable"
},
"account_type": "Receivable"
},
"1.8.4 Ajustes": {
"account_type": "Chargeable",
"is_group": 1
},
"account_type": "Receivable"
},
"1.9 Caja y Equivalentes": {
"1.9.1 Caja": {
"account_type": "Cash",
"is_group": 1
},
"1.9.2 Equivalentes de Efectivo (Bancos)": {
"1.9.2.1 Bancos Nacionales": {
"1.9.2.1.1 Banco Industrial": {
"account_type": "Bank",
"is_group": 1
},
"1.9.2.1.2 Banco Agromercantil de Guatemala": {
"account_type": "Bank"
},
"1.9.2.1.3 Banco Prom\u00e9rica": {
"account_type": "Bank"
},
"1.9.2.1.4 Banco de Am\u00e9rica Central": {
"account_type": "Bank"
},
"1.9.2.1.5 Banco G&T Continental": {
"account_type": "Bank"
},
"1.9.2.1.6 Banco Internacional": {
"account_type": "Bank"
},
"1.9.2.1.7 Banco de Desarrollo Rural": {
"account_type": "Bank"
},
"1.9.2.1.8 Banco de los Trabajadores": {
"account_type": "Bank"
},
"1.9.2.1.9 Vivibanco": {
"account_type": "Bank"
},
"account_type": "Bank"
},
"1.9.2.2 Bancos Internacionales": {
"1.9.2.2.1 HSBC": {
"account_type": "Bank"
},
"account_type": "Bank"
},
"1.9.2.3 Cadena de Bloques (Blockchain)": {
"1.9.2.3.1 Billetera Bitcoin 1234567890abcdefg": {
"account_type": "Cash"
},
"account_type": "Cash"
},
"account_type": "Bank"
},
"1.9.3 Inversiones a Corto Plazo": {
"account_type": "Bank",
"is_group": 1
},
"1.9.4 Otros Equivalentes de Caja y Bancos": {
"account_type": "Cash",
"is_group": 1
},
"account_type": "Bank"
},
"Impuestos por Cobrar": {
"Retenciones de IVA recibidas": {}
}
},
"No Corriente": {
"Activos Fijos": {
"account_type": "Fixed Asset"
},
"Cargos Diferidos": {}
},
"account_number": "3",
"root_type": "Asset"
}
}

View File

@@ -0,0 +1,835 @@
{
"country_code": "hu",
"name": "Hungary - Chart of Accounts",
"tree": {
"1. SZ\u00c1MLAOSZT\u00c1LY BEFEKTETETT ESZK\u00d6Z\u00d6K": {
"11. IMMATERI\u00c1LIS JAVAK": {
"111. Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s aktiv\u00e1lt \u00e9rt\u00e9ke": {},
"112. K\u00eds\u00e9rleti fejleszt\u00e9s aktiv\u00e1lt \u00e9rt\u00e9ke": {},
"113. Vagyoni \u00e9rt\u00e9k\u0171 jogok": {},
"114. Szellemi term\u00e9kek": {},
"115. \u00dczleti vagy c\u00e9g\u00e9rt\u00e9k": {},
"117. Immateri\u00e1lis javak \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}
},
"12-16. T\u00c1RGYI ESZK\u00d6Z\u00d6K": {
"12. INGATLANOK \u00c9S KAPCSOL\u00d3D\u00d3 VAGYONI \u00c9RT\u00c9K\u00db JOGOK": {
"121. Telkek, f\u00f6ldter\u00fclet ": {
"1211. Telkek, f\u00f6ldter\u00fcletek brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1218. Telkek, f\u00f6ldter\u00fcletek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1219. Telkek, f\u00f6ldter\u00fcletek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"122. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
"1221. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1228. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1229. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"123. \u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok ": {
"account_type": "Fixed Asset",
"is_group": 1
},
"124. Egy\u00e9b ingatlanok": {
"is_group": 1
},
"125. \u00dczemk\u00f6r\u00f6n k\u00edv\u00fcli ingatlanok, \u00e9p\u00fcletek ": {
"is_group": 1
},
"126. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
"is_group": 1
},
"127. Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
"129. Kis \u00e9rt\u00e9k\u0171 ingatlanok": {}
},
"13. M\u00dbSZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u00dbVEK": {
"131. Termel\u0151 g\u00e9pek, berendez\u00e9sek, szersz\u00e1mok, gy\u00e1rt\u00f3eszk\u00f6z\u00f6k": {
"1311. Termel\u0151 g\u00e9pek, berendez\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1318. Termel\u0151 g\u00e9pek, berendez\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1319. Termel\u0151 g\u00e9pek, berendez\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"132. M\u0171szaki j\u00e1rm\u0171vek": {},
"133. Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {},
"139. Kis \u00e9rt\u00e9k\u0171 m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {}
},
"14. EGY\u00c9B BERENDEZ\u00c9SEK, FELSZEREL\u00c9SEK, J\u00c1RM\u00dbVEK": {
"141. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek": {
"1411. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1418. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1419. Egy\u00e9b (\u00fczemi \u2013 \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"142. Egy\u00e9b j\u00e1rm\u0171vek": {
"1421. Egy\u00e9b j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1428. Egy\u00e9b j\u00e1rm\u0171vek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1429. Egy\u00e9b j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"143. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek": {
"1431. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
"account_type": "Fixed Asset"
},
"1438. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"1439. Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"144. Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek": {
"account_type": "Fixed Asset"
},
"145. J\u00f3l\u00e9ti berendez\u00e9sek, felszerel\u00e9si t\u00e1rgyak \u00e9s k\u00e9pz\u0151m\u0171v\u00e9szeti alkot\u00e1sok": {
"account_type": "Fixed Asset"
},
"147. Egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {
"account_type": "Fixed Asset"
},
"149. Kis \u00e9rt\u00e9k\u0171 egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek": {
"account_type": "Fixed Asset"
}
},
"15. TENY\u00c9SZ\u00c1LLATOK": {
"151. Teny\u00e9sz\u00e1llatok": {}
},
"16. BERUH\u00c1Z\u00c1SOK, FEL\u00daJ\u00cdT\u00c1SOK": {
"161. Befejezetlen beruh\u00e1z\u00e1sok ": {},
"162. Fel\u00faj\u00edt\u00e1sok": {},
"168. Beruh\u00e1z\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {}
},
"17-19. BEFEKTETETT P\u00c9NZ\u00dcGYI ESZK\u00d6Z\u00d6K": {
"17. TULAJDONI R\u00c9SZESED\u00c9ST JELENT\u00d5 BEFEKTET\u00c9SEK (R\u00c9SZESED\u00c9SEK)": {
"171. Tart\u00f3s r\u00e9szesed\u00e9s kapcsolt v\u00e1llalkoz\u00e1sban": {},
"172. Egy\u00e9b tart\u00f3s r\u00e9szesed\u00e9s": {},
"177. R\u00e9szesed\u00e9sek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
"179. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"18. HITELVISZONYT MEGTESTES\u00cdT\u00d5 \u00c9RT\u00c9KPAP\u00cdROK": {
"181. \u00c1llamk\u00f6tv\u00e9nyek": {},
"182. Kapcsolt v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {},
"183. Egy\u00e9b v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {},
"184. Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {},
"189. \u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"19. TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K (tart\u00f3s bankbet\u00e9tek)": {
"191. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k kapcsolt v\u00e1llalkoz\u00e1sban": {},
"192. Tart\u00f3s bankbet\u00e9tek": {},
"193. Egy\u00e9b tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {},
"194. Tart\u00f3s bankbet\u00e9tek kapcsolt v\u00e1llalkoz\u00e1sban": {},
"195. Tart\u00f3s bankbet\u00e9tek egy\u00e9b r\u00e9szesed\u00e9si viszonyban \u00e1ll\u00f3 v\u00e1llalkoz\u00e1sban": {},
"196. Egy\u00e9b tart\u00f3s bankbet\u00e9tek": {},
"197. P\u00e9nz\u00fcgyi l\u00edzing miatti tart\u00f3s k\u00f6vetel\u00e9s": {},
"199. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k (\u00e9s bankbet\u00e9tek) \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
}
}
},
"root_type": "Asset"
},
"2. SZ\u00c1MLAOSZT\u00c1LY K\u00c9SZLETEK": {
"21-22. ANYAGOK": {
"211 - 219. Nyers- \u00e9s alapanyagok ": {},
"221. Seg\u00e9danyagok": {},
"222. \u00dczem- \u00e9s f\u0171t\u0151anyagok ": {},
"223. Fenntart\u00e1si anyagok ": {},
"224. \u00c9p\u00edt\u00e9si anyagok": {},
"225. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k ": {},
"226. T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt anyagok": {},
"227. Egy\u00e9b anyagok": {},
"228. Anyagok \u00e1rk\u00fcl\u00f6nb\u00f6zete": {},
"229. Anyagok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"23. BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZ TERM\u00c9KEK": {
"231 - 234. Befejezetlen termel\u00e9s ": {
"231. Befejezetlen termel\u00e9s": {},
"232. F\u00e9lk\u00e9sz term\u00e9kek": {}
},
"238. F\u00e9lk\u00e9sz term\u00e9kek k\u00e9szlet\u00e9rt\u00e9k-k\u00fcl\u00f6nb\u00f6zete": {},
"239. Befejezetlen termel\u00e9s \u00e9s f\u00e9lk\u00e9sz term\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"24. N\u00d6VEND\u00c9K-, H\u00cdZ\u00d3- \u00c9S EGY\u00c9B \u00c1LLATOK": {
"is_group": 1
},
"25. K\u00c9SZTERM\u00c9KEK": {
"251-257. K\u00e9szterm\u00e9kek": {},
"258. K\u00e9szterm\u00e9kek k\u00e9szlet\u00e9rt\u00e9k-k\u00fcl\u00f6nb\u00f6zete": {},
"259. K\u00e9szterm\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"26-28. \u00c1RUK ": {
"261. Kereskedelmi \u00e1ruk": {
"account_type": "Stock",
"is_group": 0
},
"262. Idegen helyen t\u00e1rolt, bizom\u00e1nyba \u00e1tadott \u00e1ruk": {
"account_type": "Stock",
"is_group": 0
},
"263. T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt \u00e1ruk": {
"account_type": "Stock",
"is_group": 0
},
"264. Bels\u0151 (egys\u00e9gek, tev\u00e9kenys\u00e9gek k\u00f6z\u00f6tti) \u00e1tad\u00e1s-\u00e1tv\u00e9tel \u00fctk\u00f6z\u0151sz\u00e1mla": {
"account_type": "Stock",
"is_group": 0
},
"269. Kereskedelmi \u00e1ruk \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
"account_type": "Stock",
"is_group": 0
},
"account_type": "Stock"
},
"27. K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK ": {
"271. K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {},
"279. K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"28. BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
"is_group": 1
},
"root_type": "Asset"
},
"3. SZ\u00c1MLAOSZT\u00c1LY K\u00d6VETEL\u00c9SEK, P\u00c9NZ\u00dcGYI ESZK\u00d6Z\u00d6K \u00c9S AKT\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
"31. K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL\u00cdT\u00c1SB\u00d3L \u00c9S SZOLG\u00c1LTAT\u00c1SB\u00d3L (VEV\u00d5K) ": {
"311. Belf\u00f6ldi k\u00f6vetel\u00e9sek (forintban)": {
"account_type": "Receivable"
},
"312. Belf\u00f6ldi k\u00f6vetel\u00e9sek (deviz\u00e1ban)": {
"account_type": "Receivable"
},
"315. Belf\u00f6ldi k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa ": {},
"316. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek (forintban)": {
"account_type": "Receivable"
},
"317. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek (deviz\u00e1ban)": {
"account_type": "Receivable"
},
"319. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"32. K\u00d6VETEL\u00c9SEK KAPCSOLT V\u00c1LLALKOZ\u00c1SSAL SZEMBEN": {
"is_group": 1
},
"33. K\u00d6VETEL\u00c9SEK EGY\u00c9B R\u00c9SZESED\u00c9SI VISZONYBAN L\u00c9V\u00d5 V\u00c1LLALKOZ\u00c1SSAL SZEMBEN ": {
"is_group": 1
},
"34. V\u00c1LT\u00d3K\u00d6VETEL\u00c9SEK": {
"is_group": 1
},
"35. ADOTT EL\u00d5LEGEK": {
"351. Immateri\u00e1lis javakra adott el\u0151legek": {},
"352. Beruh\u00e1z\u00e1sokra adott el\u0151legek": {},
"353. K\u00e9szletekre adott el\u0151legek": {},
"358. Jegyzett, de m\u00e9g be nem fizetett t\u0151ke r\u00e9szesed\u00e9si viszonyban nem l\u00e9v\u0151 v\u00e1llalkoz\u00e1st\u00f3l": {},
"359. Adott el\u0151legek \u00e9rt\u00e9kveszt\u00e9se \u00e9s vissza\u00edr\u00e1sa": {}
},
"36. EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
"361. Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9sek": {
"3611. Munkav\u00e1llal\u00f3knak foly\u00f3s\u00edtott el\u0151legek": {},
"3612. El\u0151\u00edrt tartoz\u00e1sok": {},
"3613. Egy\u00e9b elsz\u00e1mol\u00e1sok a munkav\u00e1llal\u00f3kkal": {}
},
"362. K\u00f6lts\u00e9gvet\u00e9ssel szembeni k\u00f6vetel\u00e9sek": {
"is_group": 1
},
"363. R\u00f6vid lej\u00e1ratra k\u00f6lcs\u00f6nadott p\u00e9nzeszk\u00f6z\u00f6k": {
"is_group": 1
},
"364. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {
"3641. R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {},
"3642. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6kb\u0151l \u00e1tsorolt k\u00f6vetel\u00e9sek": {}
},
"365. V\u00e1s\u00e1rolt \u00e9s kapott k\u00f6vetel\u00e9sek ": {
"is_group": 1
},
"366. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {},
"367. Hat\u00e1rid\u0151s, opci\u00f3s \u00e9s swap \u00fcgyletekkel kapcsolatos k\u00f6vetel\u00e9sek": {},
"368. K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek ": {
"3681. Bizom\u00e1nyosi \u00fcgylettel kapcsolatos elsz\u00e1mol\u00e1sok": {},
"3682. \u00c9rt\u00e9kpap\u00edr-elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"3683. Import beszerz\u00e9sek \u00e1f\u00e1ja": {},
"3684. Ad\u00f3sok": {},
"3685. Biztos\u00edt\u00f3int\u00e9zettel szembeni k\u00f6vetel\u00e9sek": {},
"3686. Barter \u00fcgylet elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"3687. \u00c1rfolyam k\u00fcl\u00f6nb\u00f6zetek elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"3688. Ki nem emelt egy\u00e9b k\u00f6vetel\u00e9sek": {}
},
"369. Egy\u00e9b k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"37. \u00c9RT\u00c9KPAP\u00cdROK": {
"371. R\u00e9szesed\u00e9sek": {
"3711. R\u00e9szesed\u00e9s anyav\u00e1llalatban": {},
"3712. R\u00e9szesed\u00e9s le\u00e1nyv\u00e1llalatban": {},
"3713. R\u00e9szesed\u00e9s k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1sban": {},
"3714. R\u00e9szesed\u00e9s t\u00e1rsult v\u00e1llalkoz\u00e1sban": {},
"3719. Kapcsolt v\u00e1llalkoz\u00e1sban l\u00e9v\u0151 r\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"372. Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {
"3721. Elad\u00e1sra v\u00e1s\u00e1rolt egy\u00e9b r\u00e9szesed\u00e9sek": {}
},
"373. Forgat\u00e1si c\u00e9l\u00fa hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok ": {
"3741. Elad\u00e1sra v\u00e1s\u00e1rolt hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok": {},
"3742. Elad\u00e1sra v\u00e1s\u00e1rolt diszkont \u00e9rt\u00e9kpap\u00edrok": {},
"3749. Forgat\u00e1si c\u00e9l\u00fa hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"378. \u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {},
"379. \u00c9rt\u00e9kpap\u00edr elsz\u00e1mol\u00e1si sz\u00e1mla": {}
},
"38. P\u00c9NZESZK\u00d6Z\u00d6K": {
"381. P\u00e9nzt\u00e1r ": {
"3811. P\u00e9nzt\u00e1r-sz\u00e1mla": {},
"3812. Elektronikus p\u00e9nzeszk\u00f6z\u00f6k ": {},
"account_type": "Cash"
},
"382. Valutap\u00e9nzt\u00e1r ": {
"3821. Valutap\u00e9nzt\u00e1r-sz\u00e1mla": {},
"3829. Valuta \u00e1rfolyamk\u00fcl\u00f6nb\u00f6zeti sz\u00e1mla ": {}
},
"383. Csekkek": {},
"384. Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla ": {
"account_type": "Bank",
"is_group": 1
},
"385. Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k ": {
"3851. Kamatoz\u00f3 bet\u00e9tsz\u00e1ml\u00e1k": {},
"3852. Elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l ": {},
"3853. Beruh\u00e1z\u00e1sra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k": {},
"3854. Fejleszt\u00e9si c\u00e9lra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k ": {},
"3855. Egy\u00e9b c\u00e9lra elk\u00fcl\u00f6n\u00edtett p\u00e9nzeszk\u00f6z\u00f6k": {},
"3856. Lak\u00e1s\u00e9p\u00edt\u00e9si bet\u00e9tsz\u00e1mla": {},
"3857. Elk\u00fcl\u00f6n\u00edtett lak\u00e1s\u00e9p\u00edt\u00e9si c\u00e9l\u00fa p\u00e9nzeszk\u00f6z\u00f6k ": {},
"3858. Lak\u00e1s\u00e9p\u00edt\u00e9s \u00faton l\u00e9v\u0151 p\u00e9nzeszk\u00f6zei": {}
},
"386. Devizabet\u00e9t-sz\u00e1mla ": {
"3861. Devizabet\u00e9t-sz\u00e1mla": {},
"3862. K\u00fclf\u00f6ld\u00f6n vezetett devizabet\u00e9t-sz\u00e1mla ": {},
"3863. Devizat\u00f6rzsbet\u00e9t-sz\u00e1mla": {},
"3868. Egy\u00e9b devizabet\u00e9t-sz\u00e1mla": {},
"3869. Devizabet\u00e9t \u00e1rfolyamk\u00fcl\u00f6nb\u00f6zeti sz\u00e1mla ": {}
},
"387. Elektronikus p\u00e9nz": {},
"389. \u00c1tvezet\u00e9si sz\u00e1mla": {}
},
"39. AKT\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
"391. Bev\u00e9telek akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
"3911. Diszkont \u00e9rt\u00e9kpap\u00edrok id\u0151ar\u00e1nyos kamat\u00e1nak elhat\u00e1rol\u00e1sa": {},
"3912. \u00c9rt\u00e9kpap\u00edrok beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 k\u00fcl\u00f6nb\u00f6zetb\u0151l az id\u0151ar\u00e1nyos \u00e1rfolyamnyeres\u00e9g elhat\u00e1rol\u00e1sa": {},
"3913. \u00c1rbev\u00e9tel, egy\u00e9b kamatbev\u00e9tel, egy\u00e9b bev\u00e9tel elhat\u00e1rol\u00e1sa": {}
},
"392. K\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
"3921. \u00c9rt\u00e9kpap\u00edrok, r\u00e9szesed\u00e9sek beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 bizom\u00e1nyi d\u00edj, v\u00e1s\u00e1rolt v\u00e9teli opci\u00f3 d\u00edj\u00e1nak elhat\u00e1rol\u00e1sa": {},
"3922. T\u00f6bbletk\u00f6telezetts\u00e9gek elhat\u00e1rol\u00e1sa": {},
"3923. K\u00f6lts\u00e9gek, egy\u00e9b fizetett kamatok, egy\u00e9b r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {}
},
"393. Halasztott r\u00e1ford\u00edt\u00e1sok ": {
"3931. Tartoz\u00e1s\u00e1tv\u00e1llal\u00e1sok miatti r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {},
"3932. Devizak\u00f6telezetts\u00e9gek \u00e1rfolyamvesztes\u00e9g\u00e9nek elhat\u00e1rol\u00e1sa ": {}
},
"399. A k\u00f6vetel\u00e9s-jelleg\u0171 akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
},
"root_type": "Asset"
},
"4. SZ\u00c1MLAOSZT\u00c1LY FORR\u00c1SOK": {
"41. SAJ\u00c1T T\u00d5KE": {
"411. Jegyzett\u0151ke ": {},
"412. T\u0151ketartal\u00e9k": {},
"413. Eredm\u00e9nytartal\u00e9k": {},
"414. Lek\u00f6t\u00f6tt tartal\u00e9k ": {
"4141. Lek\u00f6t\u00f6tt tartal\u00e9k t\u0151ketartal\u00e9kb\u00f3l": {},
"4142. Lek\u00f6t\u00f6tt tartal\u00e9k eredm\u00e9nytartal\u00e9kb\u00f3l": {},
"4143. Lek\u00f6t\u00f6tt tartal\u00e9k p\u00f3tbefizet\u00e9sb\u0151l ": {}
},
"417. \u00c9rt\u00e9kel\u00e9si tartal\u00e9k": {},
"418. El\u0151z\u0151 \u00e9vek helyesb\u00edt\u00e9s\u00e9b\u0151l sz\u00e1rmaz\u00f3 m\u00e9rleg szerinti eredm\u00e9ny": {},
"419. Ad\u00f3zott eredm\u00e9ny": {}
},
"42. C\u00c9LTARTAL\u00c9KOK": {
"421. C\u00e9ltartal\u00e9k a v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gekre ": {},
"422. C\u00e9ltartal\u00e9k a j\u00f6v\u0151beni k\u00f6lts\u00e9gekre": {},
"424. \u00c1rfolyamvesztes\u00e9g id\u0151beli elhat\u00e1rol\u00e1sa alapj\u00e1n k\u00e9pzett c\u00e9ltartal\u00e9k ": {},
"429. Egy\u00e9b c\u00e9ltartal\u00e9k": {}
},
"43-47. K\u00d6TELEZETTS\u00c9GEK": {
"43. H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
"431. H\u00e1trasorolt k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
"4311. H\u00e1trasorolt k\u00f6telezetts\u00e9gek anyav\u00e1llalattal szemben ": {},
"4312. H\u00e1trasorolt k\u00f6telezetts\u00e9gek le\u00e1nyv\u00e1llalattal szemben": {},
"4313. H\u00e1trasorolt k\u00f6telezetts\u00e9gek k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1ssal szemben ": {},
"4314. H\u00e1trasorolt k\u00f6telezetts\u00e9gek t\u00e1rsult v\u00e1llalkoz\u00e1ssal szemben ": {}
},
"432. H\u00e1trasorolt k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {},
"433. H\u00e1trasorolt k\u00f6telezetts\u00e9gek egy\u00e9b gazd\u00e1lkod\u00f3val szemben": {}
},
"44. HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
"441. Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {},
"442. \u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek ": {},
"443. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l ": {
"4431. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l forintban ": {},
"4432. Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l deviz\u00e1ban": {}
},
"444. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek ": {
"4441. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek forintban ": {},
"4442. Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek deviz\u00e1ban ": {}
},
"445. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek ": {
"4451. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek forintban ": {},
"4452. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek deviz\u00e1ban": {}
},
"446. Tart\u00f3s k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
"is_group": 1
},
"447. Tart\u00f3s k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {},
"448. P\u00e9nz\u00fcgyi l\u00edzing miatti k\u00f6telezetts\u00e9gek ": {},
"449. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek ": {
"4491. Kincst\u00e1ri vagyon r\u00e9sz\u00e9t k\u00e9pez\u0151 eszk\u00f6z\u00f6k kezel\u00e9sbe v\u00e9tel\u00e9hez kapcsol\u00f3d\u00f3 k\u00f6telezetts\u00e9g": {},
"4492. Alap\u00edt\u00f3kkal szembeni hossz\u00fa lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek ": {}
},
"4499. Hossz\u00fa lej\u00e1rat\u00fa egy\u00e9b k\u00f6telezetts\u00e9gek": {}
},
"45-47. R\u00d6VID LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
"451. R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k ": {
"4511. R\u00f6vid lej\u00e1rat\u00fa \u00e1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek ": {},
"4512. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {}
},
"452. R\u00f6vid lej\u00e1rat\u00fa hitelek ": {
"4521. R\u00f6vid lej\u00e1rat\u00fa hitelek forintban ": {},
"4522. R\u00f6vid lej\u00e1rat\u00fa hitelek deviz\u00e1ban ": {}
},
"453. Vev\u0151kt\u0151l kapott el\u0151legek": {},
"454-456. K\u00f6telezetts\u00e9gek \u00e1rusz\u00e1ll\u00edt\u00e1sb\u00f3l \u00e9s szolg\u00e1ltat\u00e1sb\u00f3l (sz\u00e1ll\u00edt\u00f3k)": {
"454. Sz\u00e1ll\u00edt\u00f3k ": {
"4541. Belf\u00f6ldi anyag- \u00e9s \u00e1rusz\u00e1ll\u00edt\u00f3k ": {
"account_type": "Payable"
},
"4542. K\u00fclf\u00f6ldi anyag- \u00e9s \u00e1rusz\u00e1ll\u00edt\u00f3k ": {
"account_type": "Payable"
},
"4543. Belf\u00f6ldi szolg\u00e1ltat\u00f3k": {},
"4544. K\u00fclf\u00f6ldi szolg\u00e1ltat\u00f3k": {},
"4549. Nem sz\u00e1ml\u00e1zott sz\u00e1ll\u00edt\u00e1sok, szolg\u00e1ltat\u00e1sok ": {
"account_type": "Stock Received But Not Billed"
}
},
"455. Beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {
"4551. Belf\u00f6ldi beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {},
"4552. K\u00fclf\u00f6ldi beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k": {},
"4559. Nem sz\u00e1ml\u00e1zott beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k ": {}
},
"456. Nem sz\u00e1ml\u00e1zott sz\u00e1ll\u00edt\u00f3k": {}
},
"457. V\u00e1lt\u00f3tartoz\u00e1sok": {},
"458. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
"4581. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek anyav\u00e1llalattal szemben ": {},
"4582. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek le\u00e1nyv\u00e1llalattal szemben": {},
"4583. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek k\u00f6z\u00f6s vezet\u00e9s\u0171 v\u00e1llalkoz\u00e1ssal szemben": {},
"4584. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek t\u00e1rsult v\u00e1llalkoz\u00e1ssal szemben": {}
},
"459. R\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {},
"461-479. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek": {
"461. Eredm\u00e9nyt terhel\u0151 ad\u00f3k elsz\u00e1mol\u00e1sa": {
"4611. T\u00e1rsas\u00e1gi ad\u00f3 elsz\u00e1mol\u00e1sa ": {},
"4612. K\u00fcl\u00f6nad\u00f3 elsz\u00e1mol\u00e1sa ": {},
"4613. Egyszer\u0171s\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3 elsz\u00e1mol\u00e1sa ": {}
},
"462. Szem\u00e9lyi j\u00f6vedelemad\u00f3 elsz\u00e1mol\u00e1sa ": {
"4612. Mag\u00e1nszem\u00e9lyekt\u0151l levont szem\u00e9lyi j\u00f6vedelem ad\u00f3 elsz\u00e1mol\u00e1sa ": {},
"4621. Kifizet\u0151t terhel\u0151 szem\u00e9lyi j\u00f6vedelem ad\u00f3 elsz\u00e1mol\u00e1sa ": {}
},
"463. K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek ": {
"463-1. Nyugd\u00edjj\u00e1rul\u00e9k ": {},
"463-10. Innov\u00e1ci\u00f3s j\u00e1rul\u00e9k ": {},
"463-11. \u00d6nellen\u0151rz\u00e9si p\u00f3tl\u00e9k ": {},
"463-12. Mulaszt\u00e1si b\u00edrs\u00e1g, ad\u00f3b\u00edrs\u00e1g ": {},
"463-13. K\u00e9sedelmi p\u00f3tl\u00e9k ": {},
"463-14. Egy\u00e9b k\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek ": {},
"463-2. Eg\u00e9szs\u00e9gbiztos\u00edt\u00e1si- \u00e9s munkaer\u0151 piaci j\u00e1rul\u00e9k ": {},
"463-3. Rehabilit\u00e1ci\u00f3s hozz\u00e1j\u00e1rul\u00e1s ": {},
"463-4. Szoci\u00e1lis hozz\u00e1j\u00e1rul\u00e1si ad\u00f3 ": {},
"463-5. Eg\u00e9szs\u00e9g\u00fcgyi szolg\u00e1ltat\u00e1si j\u00e1rul\u00e9k ": {},
"463-6. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s ": {},
"463-7. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s ": {},
"463-8. Egyszer\u0171s\u00edtett foglalkoztat\u00e1s k\u00f6zterhe ": {},
"463-9. C\u00e9gaut\u00f3ad\u00f3 ": {}
},
"464. G\u00e9pj\u00e1rm\u0171 ad\u00f3 (c\u00e9gaut\u00f3ad\u00f3) elsz\u00e1mol\u00e1sa": {
"is_group": 1
},
"465. V\u00e1m- \u00e9s p\u00e9nz\u00fcgy\u0151rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla ": {
"4651. V\u00e1mk\u00f6lts\u00e9gek \u00e9s egy\u00e9b v\u00e1mterhek elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"4652. Importbeszerz\u00e9s ut\u00e1n fizetend\u0151 \u00e1ltal\u00e1nos forgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"4653. V\u00e1m- \u00e9s p\u00e9nz\u00fcgy\u0151rs\u00e9ggel kapcsolatos egy\u00e9b elsz\u00e1mol\u00e1sok ": {}
},
"466. El\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3 ": {
"4661. Beszerz\u00e9sek el\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3ja ": {},
"4662. Ar\u00e1nyos\u00edt\u00e1ssal megosztand\u00f3 el\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3": {}
},
"467. Fizetend\u0151 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {},
"468. \u00c1ltal\u00e1nos forgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"469. Helyi ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla ": {
"4691. \u00c9p\u00edtm\u00e9nyad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4692. Telekad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"4693. Kommun\u00e1lis ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4694. Idegenforgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4695. Helyi ipar\u0171z\u00e9si ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4696. G\u00e9pj\u00e1rm\u0171ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"4697. K\u00fclf\u00f6ldi g\u00e9pj\u00e1rm\u0171ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4699. Egy\u00e9b helyi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {}
},
"471. J\u00f6vedelemelsz\u00e1mol\u00e1si sz\u00e1mla ": {
"4711. Keresetelsz\u00e1mol\u00e1si sz\u00e1mla ": {},
"4712. T\u00e1rsadalombiztos\u00edt\u00e1si ell\u00e1t\u00e1s ": {},
"4713. Egy\u00e9b kifizet\u00e9sek elsz\u00e1mol\u00e1sa": {}
},
"472. Fel nem vett j\u00e1rand\u00f3s\u00e1gok": {},
"473. Elsz\u00e1mol\u00e1s a t\u00e1rsadalombiztos\u00edt\u00e1ssal ": {},
"474. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {
"4741. K\u00f6zponti m\u0171szaki fejleszt\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {},
"4742. Elsz\u00e1mol\u00e1sra kapott p\u00e9nzeszk\u00f6z\u00f6k": {},
"4743. K\u00f6rnyezetv\u00e9delmi term\u00e9k d\u00edjfizet\u00e9si k\u00f6telezetts\u00e9g ": {},
"4749. Egy\u00e9b befizet\u00e9sek az elk\u00fcl\u00f6n\u00edtett alapokba": {}
},
"475. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s (EHO) elsz\u00e1mol\u00e1sa": {},
"476. Egy\u00e9b \u00e1llami ad\u00f3hat\u00f3s\u00e1ggal szembeni k\u00f6telezetts\u00e9g elsz\u00e1mol\u00e1sa": {
"4761. K\u00e1rt\u00e9r\u00edt\u00e9s": {},
"4762. B\u00edr\u00f3i letilt\u00e1s": {},
"4763. Banki-elsz\u00e1mol\u00e1s": {},
"4764. Levont szakszervezeti d\u00edj": {},
"4765. Mag\u00e1n nyugd\u00edjp\u00e9nzt\u00e1ri befizet\u00e9si k\u00f6telezetts\u00e9gek": {}
},
"477. R\u00f6vid lej\u00e1rat\u00fa egy\u00e9b k\u00f6telezetts\u00e9gek munkav\u00e1llal\u00f3kkal \u00e9s tulajdonosokkal szemben": {},
"478. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6telezetts\u00e9gek ": {},
"479. K\u00fcl\u00f6nf\u00e9le r\u00f6vid lej\u00e1rat\u00fa egy\u00e9b befizet\u00e9si k\u00f6telezetts\u00e9gek ": {
"4791. Biztos\u00edt\u00f3 int\u00e9zetekkel szembeni k\u00f6telezetts\u00e9gek": {},
"4792. Hitelez\u0151k": {},
"4793. \u00c1tv\u00e1llalt k\u00f6telezetts\u00e9gek": {},
"4794. Beszerz\u00e9si \u00e1rba beletartoz\u00f3 el\u0151\u00edrt egy\u00e9b k\u00f6telezetts\u00e9gek ": {},
"4795. Egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa el\u0151\u00edrt k\u00f6telezetts\u00e9gek": {}
}
}
}
},
"48. PASSZ\u00cdV ID\u00d5BELI ELHAT\u00c1ROL\u00c1SOK": {
"481. Bev\u00e9telek passz\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
"4811. Befolyt, elsz\u00e1molt bev\u00e9telek elhat\u00e1rol\u00e1sa": {},
"4812. K\u00f6lts\u00e9gek ellent\u00e9telez\u00e9s\u00e9re kapott t\u00e1mogat\u00e1sok elhat\u00e1rol\u00e1sa": {},
"4813. Devizaeszk\u00f6z\u00f6k \u00e9s devizak\u00f6telezetts\u00e9gek m\u00e9rlegfordul\u00f3napi \u00e9rt\u00e9kel\u00e9se \u00e1rfolyamnyeres\u00e9g\u00e9nek elhat\u00e1rol\u00e1sa": {}
},
"482. K\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok passz\u00edv id\u0151beli elhat\u00e1rol\u00e1sa ": {
"4821. M\u00e9rlegfordul\u00f3nap el\u0151tti id\u0151szakot terhel\u0151 k\u00f6lts\u00e9gek, r\u00e1ford\u00edt\u00e1sok elhat\u00e1rol\u00e1sa": {},
"4822. \u00c9rt\u00e9kpap\u00edrok beszerz\u00e9s\u00e9hez kapcsol\u00f3d\u00f3 k\u00fcl\u00f6nb\u00f6zetb\u0151l az id\u0151ar\u00e1nyos \u00e1rfolyam\u008fvesztes\u00e9g elhat\u00e1rol\u00e1sa": {},
"4823. Fizetend\u0151 kamatok elhat\u00e1rol\u00e1sa ": {}
},
"483. Halasztott bev\u00e9telek ": {}
},
"49. \u00c9VI M\u00c9RLEGSZ\u00c1ML\u00c1K": {
"491. Nyit\u00f3m\u00e9rleg sz\u00e1mla ": {},
"492. Z\u00e1r\u00f3m\u00e9rleg sz\u00e1mla": {},
"493. Ad\u00f3zott eredm\u00e9ny elsz\u00e1mol\u00e1si sz\u00e1mla": {},
"494. El\u0151z\u0151 \u00e9vi ad\u00f3zott eredm\u00e9ny elsz\u00e1mol\u00e1sa": {}
},
"root_type": "Liability"
},
"5. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
"51 - 53. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
"51. ANYAGK\u00d6LTS\u00c9G": {
"511. V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei ": {
"5111. Alapanyag k\u00f6lts\u00e9gek": {},
"5112. Seg\u00e9danyag k\u00f6lts\u00e9gek": {},
"5113. \u00dczemanyag k\u00f6lts\u00e9gek": {},
"5114. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 gy\u00e1rt\u00f3eszk\u00f6z\u00f6k, berendez\u00e9sek, felszerel\u00e9sek \u00e9s egy\u00e9b eszk\u00f6z\u00f6k k\u00f6lts\u00e9gei": {},
"5115. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 munkaruha, v\u00e9d\u0151ruha felhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {},
"5116. Nyomtatv\u00e1nyok, irodaszerek k\u00f6lts\u00e9gei": {},
"5117. F\u0171t\u0151anyag k\u00f6lts\u00e9gek": {},
"5118. Villamosenergia felhaszn\u00e1l\u00e1s \u00e9s v\u00edzfelhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {},
"5119. Egy\u00e9b anyagfelhaszn\u00e1l\u00e1s k\u00f6lts\u00e9gei": {},
"512. Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k k\u00f6lts\u00e9gei ": {},
"5121. V\u00e1s\u00e1rolt n\u00f6vend\u00e9k\u00e1llatok k\u00f6lts\u00e9gei": {},
"5122. V\u00e1s\u00e1rolt h\u00edz\u00f3\u00e1llatok k\u00f6lts\u00e9gei": {},
"5123. V\u00e1s\u00e1rolt egy\u00e9b \u00e1llatok k\u00f6lts\u00e9gei": {},
"513. Egy\u00e9b anyagk\u00f6lts\u00e9g": {},
"519. Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {}
}
},
"52. IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
"521. Sz\u00e1ll\u00edt\u00e1s-rakod\u00e1s, rakt\u00e1roz\u00e1s k\u00f6lts\u00e9gei": {},
"522. B\u00e9rleti d\u00edjak": {},
"523. Karbantart\u00e1si k\u00f6lts\u00e9gek": {},
"524. Hirdet\u00e9s, rekl\u00e1m, propaganda k\u00f6lts\u00e9gek": {},
"525. Oktat\u00e1s \u00e9s tov\u00e1bbk\u00e9pz\u00e9s k\u00f6lts\u00e9gei": {},
"526. Utaz\u00e1si \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek (napid\u00edj n\u00e9lk\u00fcl)": {},
"529. Ig\u00e9nybe vett egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {}
},
"53. EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
"531. Hat\u00f3s\u00e1gi igazgat\u00e1si, szolg\u00e1ltat\u00e1si d\u00edjak, illet\u00e9kek": {},
"532. P\u00e9nz\u00fcgyi, befektet\u00e9si szolg\u00e1ltat\u00e1si d\u00edjak": {},
"533. Biztos\u00edt\u00e1si d\u00edj ": {},
"534. K\u00f6lts\u00e9gk\u00e9nt elsz\u00e1moland\u00f3 ad\u00f3k, j\u00e1rul\u00e9kok, term\u00e9kd\u00edjak": {},
"539. K\u00fcl\u00f6nf\u00e9le egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {}
}
},
"54 - 56. SZEM\u00c9LYI JELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
"54. B\u00c9RK\u00d6LTS\u00c9G ": {
"541. B\u00e9rk\u00f6lts\u00e9g": {},
"542. Tulajdonos szem\u00e9lyes k\u00f6zrem\u0171k\u00f6d\u00e9s\u00e9nek ellen\u00e9rt\u00e9ke": {},
"543. Sz\u00f6vetkezeti tagok munkad\u00edja": {}
},
"55. SZEM\u00c9LYI JELLEG\u00db EGY\u00c9B KIFIZET\u00c9SEK": {
"551. Munkav\u00e1llal\u00f3knak, tagoknak fizetett szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek ": {
"5511. Betegszabads\u00e1g d\u00edja, munk\u00e1ltat\u00f3t terhel\u0151 t\u00e1pp\u00e9nz, t\u00e1pp\u00e9nz kieg\u00e9sz\u00edt\u00e9s": {},
"5512. V\u00e9gkiel\u00e9g\u00edt\u00e9s": {},
"5513. Munk\u00e1baj\u00e1r\u00e1ssal kapcsolatos egy\u00e9b k\u00f6lts\u00e9gek t\u00e9r\u00edt\u00e9se": {},
"5514. Kik\u00fcldet\u00e9s napid\u00edja": {},
"5515. Megv\u00e1ltozott munkak\u00e9pess\u00e9g\u0171 munkav\u00e1llal\u00f3k keresetkieg\u00e9sz\u00edt\u00e9se, fizetett seg\u00e9lyek": {},
"5516. \u00dcd\u00fcl\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {},
"5517. Lak\u00e1s\u00e9p\u00edt\u00e9sre ny\u00fajtott t\u00e1mogat\u00e1s, alb\u00e9rleti hozz\u00e1j\u00e1rul\u00e1s": {},
"5518. Jubileumi jutalom, t\u00e1rgyjutalom": {},
"5519. Sorkatonai vagy polg\u00e1ri szolg\u00e1lat teljes\u00edt\u00e9s\u00e9t k\u00f6vet\u0151en fizetett szem\u00e9lyi alapb\u00e9r": {}
},
"552. J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {},
"559. Egy\u00e9b szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek ": {
"5591. Munk\u00e1ltat\u00f3 \u00e1ltal fizetett baleset-, \u00e9let- \u00e9s nyugd\u00edjbiztos\u00edt\u00e1s d\u00edja": {},
"5592. Munk\u00e1ltat\u00f3 \u00e1ltal \u00f6nk\u00e9ntes p\u00e9nzt\u00e1rba befizetett munk\u00e1ltat\u00f3i tagd\u00edj hozz\u00e1j\u00e1rul\u00e1s": {},
"5593. Munk\u00e1ltat\u00f3t terhel\u0151 szem\u00e9lyi j\u00f6vedelemad\u00f3": {},
"5594. Munk\u00e1ltat\u00f3i hozz\u00e1j\u00e1rul\u00e1s a korengedm\u00e9nyes nyugd\u00edj ig\u00e9nybev\u00e9tel\u00e9hez": {},
"5596. Fizetett szerz\u0151i, \u00edr\u00f3i \u00e9s m\u00e1s jogv\u00e9delmet \u00e9lvez\u0151 munk\u00e1k d\u00edjai \u00e9s ezekkel kapcsolatos k\u00f6zrem\u0171k\u00f6d\u0151i d\u00edjak": {},
"5597. Fizetett \u00f6szt\u00f6nd\u00edjak": {},
"5598. Reprezent\u00e1ci\u00f3s k\u00f6lts\u00e9gek, \u00e9tkez\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {},
"5599. Munk\u00e1ltat\u00f3 \u00e1ltal fizetett mag\u00e1nnyugd\u00edj-p\u00e9nzt\u00e1ri tagd\u00edj kieg\u00e9sz\u00edt\u00e9s, munkav\u00e1llal\u00f3kkal kapcsolatos biztos\u00edt\u00e1si d\u00edjak": {}
}
},
"56. B\u00c9RJ\u00c1RUL\u00c9KOK": {
"561. Nyugd\u00edjbiztos\u00edt\u00e1si \u00e9s eg\u00e9szs\u00e9gbiztos\u00edt\u00e1si j\u00e1rul\u00e9k ": {},
"562. Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s": {},
"563. Munkaad\u00f3i j\u00e1rul\u00e9k": {},
"564. Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s ": {},
"569. Egy\u00e9b hozz\u00e1j\u00e1rul\u00e1s ": {}
}
},
"57. \u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
"571. Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {
"5711. Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {
"account_type": "Depreciation"
},
"5712. Kiemelt, kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) eszk\u00f6z\u00f6k terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {},
"57121. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {},
"57122. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) szellemi term\u00e9kek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {},
"57123. Kis \u00e9rt\u00e9k\u0171 (50 eFt egyedi beszerz\u00e9si \u00e9rt\u00e9k alatti) t\u00e1rgyi eszk\u00f6z\u00f6k terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {}
}
},
"58. AKTIV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
"581. Saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa ": {},
"582. Saj\u00e1t el\u0151\u00e1ll\u00edt\u00e1s\u00fa eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt\u00e9ke": {},
"589. Aktiv\u00e1lt saj\u00e1t teljes\u00edtm\u00e9nyek \u00e1tvezet\u00e9si sz\u00e1mla": {}
},
"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
"is_group": 1
},
"root_type": "Expense"
},
"6. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GHELYEK, \u00c1LTAL\u00c1NOS K\u00d6LTS\u00c9GEK": {
"61. JAV\u00cdT\u00d3-KARBANTART\u00d3 \u00dcZEMEK K\u00d6LTS\u00c9GEI": {},
"62. SZOLG\u00c1LTAT\u00c1ST V\u00c9GZ\u00d5 \u00dcZEMEK (EGYS\u00c9GEK) K\u00d6LTS\u00c9GEI": {},
"63. G\u00c9PK\u00d6LTS\u00c9G": {},
"64-65. \u00dcZEMI IR\u00c1NY\u00cdT\u00c1S \u00c1LTAL\u00c1NOS K\u00d6LTS\u00c9GEI": {},
"66. K\u00d6ZPONTI IR\u00c1NY\u00cdT\u00c1S \u00c1LTL\u00c1NOS K\u00d6LTS\u00c9GEI": {},
"67. \u00c9RT\u00c9KES\u00cdT\u00c9SI, FORGALMAZ\u00c1SI K\u00d6LTS\u00c9GEK": {},
"68. ELK\u00dcL\u00d6N\u00cdTETT EGY\u00c9B \u00c1LTL\u00c1NOS K\u00d6LTS\u00c9GEK": {
"681. Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s k\u00f6lts\u00e9gei": {},
"682. Alap- \u00e9s alkalmazott kutat\u00e1s saj\u00e1t k\u00f6lts\u00e9gei": {},
"683. V\u00e1llalkoz\u00e1sban adott alap- \u00e9s alkalmazott kutat\u00e1s k\u00f6lts\u00e9gei": {},
"684. K\u00eds\u00e9rleti fejleszt\u00e9s saj\u00e1t k\u00f6lts\u00e9gei": {},
"685. V\u00e1llalkoz\u00e1sba adott k\u00eds\u00e9rleti fejleszt\u00e9s k\u00f6lts\u00e9gei": {},
"686. Kutat\u00e1s-k\u00eds\u00e9rleti fejleszt\u00e9s \u00e1ltal\u00e1nos \u00e9s k\u00f6zvetett k\u00f6lts\u00e9gei": {},
"687. Kutat\u00e1s-k\u00eds\u00e9rleti fejleszt\u00e9s elsz\u00e1molt \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {},
"688. Garanci\u00e1lis jav\u00edt\u00e1s k\u00f6lts\u00e9gei": {},
"689. Egy\u00e9b elk\u00fcl\u00f6n\u00edtett k\u00f6lts\u00e9gek": {}
},
"69. K\u00d6LTS\u00c9GHELYEK K\u00d6LTS\u00c9GNEMEK \u00c1TVEZET\u00c9SE": {
"691. K\u00f6lts\u00e9ghelyek k\u00f6lts\u00e9geinek \u00e1tvezet\u00e9se": {}
},
"root_type": "Expense"
},
"7. SZ\u00c1MLAOSZT\u00c1LY TEV\u00c9KENYS\u00c9GEKK\u00d6LTS\u00c9GEI": {
"is_group": 1,
"root_type": "Expense"
},
"8. SZ\u00c1MLAOSZT\u00c1LY \u00c9RT\u00c9KES\u00cdT\u00c9S ELSZ\u00c1MOLT \u00d6NK\u00d6LTS\u00c9GE \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
"81-83. SZ\u00c1MLACSOPORTOK (az \u00f6sszk\u00f6lts\u00e9g elj\u00e1r\u00e1ssal k\u00e9sz\u00fcl\u0151 eredm\u00e9ny-kimutat\u00e1shoz)": {
"81. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
"811. Anyagk\u00f6lts\u00e9g ": {},
"812. Ig\u00e9nybe vett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {},
"813. Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {},
"814. Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {},
"815. Eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
},
"82. SZEM\u00c9LYI JELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
"821. B\u00e9rk\u00f6lts\u00e9g": {},
"822. Szem\u00e9lyi jelleg\u0171 egy\u00e9b kifizet\u00e9sek": {},
"823. B\u00e9rj\u00e1rul\u00e9kok": {}
},
"83. \u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
"831. \u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s ": {}
}
},
"81-85. SZ\u00c1MLACSOPORTOK (a forgalmi k\u00f6lts\u00e9g elj\u00e1r\u00e1ssal k\u00e9sz\u00fcl\u0151 eredm\u00e9nykimutat\u00e1shoz)": {
"81-82. BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETLEN K\u00d6LTS\u00c9GEI": {
"811. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s elsz\u00e1molt k\u00f6zvetlen \u00f6nk\u00f6lts\u00e9ge": {
"account_type": "Cost of Goods Sold"
},
"812. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {
"account_type": "Stock Adjustment"
},
"813. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {
"account_type": "Expenses Included In Valuation"
}
},
"83-84. EXPORT\u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETLEN K\u00d6LTS\u00c9GEI": {
"831. Export\u00e9rt\u00e9kes\u00edt\u00e9s elsz\u00e1molt k\u00f6zvetlen \u00f6nk\u00f6lts\u00e9ge": {},
"832. Export\u00e9rt\u00e9kes\u00edt\u00e9s eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {},
"833. Export\u00e9rt\u00e9kes\u00edt\u00e9s eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
},
"85. \u00c9RT\u00c9KES\u00cdT\u00c9S K\u00d6ZVETETT K\u00d6LTS\u00c9GEI": {
"851. \u00c9rt\u00e9kes\u00edt\u00e9si, forgalmaz\u00e1si k\u00f6lts\u00e9gek": {},
"852. Igazgat\u00e1si k\u00f6lts\u00e9gek": {},
"853. Egy\u00e9b \u00e1ltal\u00e1nos k\u00f6lts\u00e9gek": {}
}
},
"86. EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
"861. Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
"8611. \u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6nyv szerinti \u00e9rt\u00e9ke": {},
"8612. \u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}
},
"862. Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 eszk\u00f6z kivezet\u00e9sek": {
"8621. Hi\u00e1nyz\u00f3, megsemmis\u00fclt, kiselejtezett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k nett\u00f3 \u00e9rt\u00e9ke": {},
"8622. Hi\u00e1nyz\u00f3, megsemmis\u00fclt, \u00e1llom\u00e1nyb\u00f3l kivezetett k\u00e9szletek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {}
},
"863. Behajthatatlan k\u00f6vetel\u00e9sek le\u00edrt \u00f6sszege": {},
"864. C\u00e9ltartal\u00e9k k\u00e9pz\u00e9s": {
"8641. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s a v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gekre": {},
"8642. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s a j\u00f6v\u0151beni k\u00f6lts\u00e9gekre": {},
"8643. C\u00e9ltartal\u00e9k-k\u00e9pz\u00e9s egy\u00e9b c\u00edmen": {}
},
"865. Ut\u00f3lag adott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {},
"866. Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
"8661. K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9ssel elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"8662. Helyi \u00f6nkorm\u00e1nyzatokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"8663. Elk\u00fcl\u00f6n\u00edtett \u00e1llami p\u00e9nzalapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"8664. T\u00e1rsadalombiztos\u00edt\u00e1ssal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"8665. EU p\u00e9nz\u00fcgyi alapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {},
"8666. R\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt egy\u00e9b ad\u00f3k \u00e9s ad\u00f3jelleg\u0171 t\u00e9telek": {}
},
"867. Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt, ad\u00f3nak nem min\u0151s\u00fcl\u0151 kifizet\u00e9sek": {
"8671. K\u00e1resem\u00e9nnyel kapcsolatos fizetett, fizetend\u0151 \u00f6sszegek": {},
"8672. K\u00f6lts\u00e9gek (r\u00e1ford\u00edt\u00e1sok) ellent\u00e9telez\u00e9s\u00e9re visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, juttat\u00e1": {},
"8673. Fejleszt\u00e9si c\u00e9lra, visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"8674. Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s visszafizetend\u0151 \u00f6sszege": {},
"8675. Tao \u00e1ltal elismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {},
"8676. Tao \u00e1ltal el nem ismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {}
},
"868. Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek": {
"8681. Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {},
"8682. T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {},
"8683. K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9se": {},
"8684. K\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {}
},
"869. K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {
"8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont.": {},
"8692. Ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g szerz\u0151d\u00e9s szerinti \u00f6sszege": {},
"8693. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tadott, r\u00e9szesed\u00e9snek vagy \u00e9rt\u00e9kpap\u00edrnak nem min\u0151s\u00fcl\u0151 eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {},
"8694. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl ny\u00fajtott szolg\u00e1ltat\u00e1sok beker\u00fcl\u00e9si \u00e9rt\u00e9ke": {},
"8695. Elengedett k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {},
"8696. Egy\u00e9b, vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 r\u00e1ford\u00edt\u00e1sok": {}
}
},
"87. P\u00c9NZ\u00dcGYI M\u0170VELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
"871. R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok, \u00e1rfolyamvesztes\u00e9gek": {},
"872. Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok \u00e1rfolyamvesztes\u00e9gek": {},
"873. Hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {},
"874. Nem hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {},
"875. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se \u00e9s vissza\u00edr\u00e1sa": {
"8751. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se": {},
"8752. R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
},
"876. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamvesztes\u00e9gei": {
"8761. Deviza- \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamvesztes\u00e9ge": {},
"8762. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamvesztes\u00e9ge": {}
},
"877. P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b r\u00e1ford\u00edt\u00e1sai": {},
"878. P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an adott engedm\u00e9ny": {},
"879. Egy\u00e9b vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {}
},
"88. RENDK\u00cdV\u00dcLI R\u00c1FORD\u00cdT\u00c1SOK": {
"881. T\u00e1rsas\u00e1gba bevitt eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {}
},
"89. EREDM\u00c9NYT TERHEL\u0150 AD\u00d3K": {
"891. T\u00e1rsas\u00e1gi ad\u00f3": {},
"892. Egyszer\u0171s\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3": {},
"893. Kisv\u00e1llalati ad\u00f3": {},
"899. Eredm\u00e9nyt terhel\u0151 egy\u00e9b ad\u00f3k": {}
},
"root_type": "Expense"
},
"9. SZ\u00c1MLAOSZT\u00c1LY BEV\u00c9TELEK": {
"91. BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
"911. Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {},
"912. Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {},
"913. Belf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {},
"918. Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {},
"919. Egy\u00e9b belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
},
"92. EXPORT\u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
"921. K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {},
"922. K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {},
"923. K\u00fclf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {},
"928. K\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {},
"929. Egy\u00e9b k\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
},
"96. EGY\u00c9B BEV\u00c9TELEK": {
"961. Egy\u00e9b bev\u00e9telnek min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
"9611. \u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k ellen\u00e9rt\u00e9ke": {},
"9612. \u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek ellen\u00e9rt\u00e9ke": {}
},
"963. K\u00f6vetel\u00e9s k\u00f6nyv szerinti \u00e9rt\u00e9k\u00e9t meghalad\u00f3an realiz\u00e1lt \u00f6sszeg": {},
"964. C\u00e9ltartal\u00e9k felold\u00e1s": {
"9651. V\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gek fedezet\u00e9re k\u00e9pzett c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa ": {},
"9652. J\u00f6v\u0151beni k\u00f6lts\u00e9gekre k\u00e9pzett c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa ": {},
"9653. Egy\u00e9b c\u00edmen k\u00e9pzett c\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa ": {}
},
"965. Ut\u00f3lag kapott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {},
"966. Ut\u00f3lag kapott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {
"9661. K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9sb\u0151l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"9662. Helyi \u00f6nkorm\u00e1nyzatokt\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"9663. Eur\u00f3pai Uni\u00f3t\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"9664. Egy\u00e9b forr\u00e1sb\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {}
},
"967. Egy\u00e9b bev\u00e9telk\u00e9nt elsz\u00e1molt p\u00e9nzbev\u00e9telek": {
"9671. K\u00e1resem\u00e9nnyel kapcsolatos t\u00e9r\u00edt\u00e9sek": {},
"9672. K\u00f6lts\u00e9gek (r\u00e1ford\u00edt\u00e1sok) ellent\u00e9telez\u00e9s\u00e9re kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"9673. Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {},
"9674. Kapott b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, fekb\u00e9rek, k\u00e9sedelmi kamatok, k\u00e1rt\u00e9r\u00edt\u00e9sek": {}
},
"968. Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa": {
"9681. Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {},
"9682. T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {},
"9683. K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {},
"9684. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
},
"969. K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
"is_group": 1
}
},
"97. P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {
"971. R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {},
"972. Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {},
"973. Hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {},
"974. Nem hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {},
"975. Kapott (j\u00e1r\u00f3) osztal\u00e9k \u00e9s r\u00e9szesed\u00e9s": {},
"976. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamnyeres\u00e9gei": {
"9761. Deviza- \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamnyeres\u00e9ge": {},
"9762. K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamnyeres\u00e9ge": {}
},
"977. P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b bev\u00e9telei": {},
"978. P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an kapott engedm\u00e9ny": {},
"979. Egy\u00e9b vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi bev\u00e9telek": {}
},
"root_type": "Income"
}
}
}

View File

@@ -2,160 +2,162 @@
"country_code": "in",
"name": "India - Chart of Accounts",
"tree": {
"Application of Funds (Assets)": {
"Current Assets": {
"Accounts Receivable": {
"Debtors": {
"account_type": "Receivable"
}
},
"Bank Accounts": {
"account_type": "Bank",
"is_group": 1
},
"Cash In Hand": {
"Cash": {
"account_type": "Cash"
},
"account_type": "Cash"
},
"Loans and Advances (Assets)": {
"is_group": 1
},
"Securities and Deposits": {
"Earnest Money": {}
},
"Stock Assets": {
"Stock in Hand": {
"account_type": "Stock"
}
},
"Tax Assets": {
"is_group": 1
}
},
"Fixed Assets": {
"Capital Equipments": {
"account_type": "Fixed Asset"
},
"Electronic Equipments": {
"account_type": "Fixed Asset"
},
"Furnitures and Fixtures": {
"account_type": "Fixed Asset"
},
"Office Equipments": {
"account_type": "Fixed Asset"
},
"Plants and Machineries": {
"account_type": "Fixed Asset"
},
"Buildings": {
"account_type": "Fixed Asset"
},
"Accumulated Depreciations": {
"account_type": "Accumulated Depreciation"
}
},
"Investments": {
"is_group": 1
},
"Temporary Accounts": {
"Temporary Opening": {
"account_type": "Temporary"
}
},
"root_type": "Asset"
},
"Expenses": {
"Direct Expenses": {
"Stock Expenses": {
"Cost of Goods Sold": {
"account_type": "Cost of Goods Sold"
},
"Expenses Included In Valuation": {
"account_type": "Expenses Included In Valuation"
},
"Stock Adjustment": {
"account_type": "Stock Adjustment"
}
}
},
"Indirect Expenses": {
"Administrative Expenses": {},
"Commission on Sales": {},
"Depreciation": {
"account_type": "Depreciation"
},
"Entertainment Expenses": {},
"Freight and Forwarding Charges": {
"account_type": "Chargeable"
},
"Legal Expenses": {},
"Marketing Expenses": {},
"Miscellaneous Expenses": {},
"Office Maintenance Expenses": {},
"Office Rent": {},
"Postal Expenses": {},
"Print and Stationary": {},
"Rounded Off": {
"account_type": "Round Off"
},
"Salary": {},
"Sales Expenses": {},
"Telephone Expenses": {},
"Travel Expenses": {},
"Utility Expenses": {},
"Write Off": {},
"Exchange Gain/Loss": {},
"Gain/Loss on Asset Disposal": {}
},
"root_type": "Expense"
},
"Income": {
"Direct Income": {
"Sales": {
"account_type": "Income Account"
},
"Service": {
"account_type": "Income Account"
},
"account_type": "Income Account"
},
"Indirect Income": {
"account_type": "Income Account",
"is_group": 1
},
"root_type": "Income"
},
"Source of Funds (Liabilities)": {
"Capital Account": {
"Reserves and Surplus": {},
"Shareholders Funds": {}
},
"Current Liabilities": {
"Accounts Payable": {
"Creditors": {
"account_type": "Payable"
},
"Payroll Payable": {}
},
"Stock Liabilities": {
"Stock Received But Not Billed": {
"account_type": "Stock Received But Not Billed"
}
},
"Duties and Taxes": {
"account_type": "Tax",
"is_group": 1
},
"Loans (Liabilities)": {
"Secured Loans": {},
"Unsecured Loans": {},
"Bank Overdraft Account": {}
}
},
"root_type": "Liability"
}
}
"Application of Funds (Assets)": {
"Current Assets": {
"Accounts Receivable": {
"Debtors": {
"account_type": "Receivable"
}
},
"Bank Accounts": {
"account_type": "Bank",
"is_group": 1
},
"Cash In Hand": {
"Cash": {
"account_type": "Cash"
},
"account_type": "Cash"
},
"Loans and Advances (Assets)": {
"is_group": 1
},
"Securities and Deposits": {
"Earnest Money": {}
},
"Stock Assets": {
"Stock In Hand": {
"account_type": "Stock"
},
"account_type": "Stock"
},
"Tax Assets": {
"is_group": 1
}
},
"Fixed Assets": {
"Capital Equipments": {
"account_type": "Fixed Asset"
},
"Electronic Equipments": {
"account_type": "Fixed Asset"
},
"Furnitures and Fixtures": {
"account_type": "Fixed Asset"
},
"Office Equipments": {
"account_type": "Fixed Asset"
},
"Plants and Machineries": {
"account_type": "Fixed Asset"
},
"Buildings": {
"account_type": "Fixed Asset"
},
"Accumulated Depreciations": {
"account_type": "Accumulated Depreciation"
}
},
"Investments": {
"is_group": 1
},
"Temporary Accounts": {
"Temporary Opening": {
"account_type": "Temporary"
}
},
"root_type": "Asset"
},
"Expenses": {
"Direct Expenses": {
"Stock Expenses": {
"Cost of Goods Sold": {
"account_type": "Cost of Goods Sold"
},
"Expenses Included In Valuation": {
"account_type": "Expenses Included In Valuation"
},
"Stock Adjustment": {
"account_type": "Stock Adjustment"
}
}
},
"Indirect Expenses": {
"Administrative Expenses": {},
"Commission on Sales": {},
"Depreciation": {
"account_type": "Depreciation"
},
"Entertainment Expenses": {},
"Freight and Forwarding Charges": {
"account_type": "Chargeable"
},
"Legal Expenses": {},
"Marketing Expenses": {},
"Miscellaneous Expenses": {},
"Office Maintenance Expenses": {},
"Office Rent": {},
"Postal Expenses": {},
"Print and Stationary": {},
"Rounded Off": {
"account_type": "Round Off"
},
"Salary": {},
"Sales Expenses": {},
"Telephone Expenses": {},
"Travel Expenses": {},
"Utility Expenses": {},
"Write Off": {},
"Exchange Gain/Loss": {},
"Gain/Loss on Asset Disposal": {}
},
"root_type": "Expense"
},
"Income": {
"Direct Income": {
"Sales": {
"account_type": "Income Account"
},
"Service": {
"account_type": "Income Account"
},
"account_type": "Income Account"
},
"Indirect Income": {
"account_type": "Income Account",
"is_group": 1
},
"root_type": "Income"
},
"Source of Funds (Liabilities)": {
"Capital Account": {
"Reserves and Surplus": {},
"Shareholders Funds": {}
},
"Current Liabilities": {
"Accounts Payable": {
"Creditors": {
"account_type": "Payable"
},
"Payroll Payable": {}
},
"Stock Liabilities": {
"Stock Received But Not Billed": {
"account_type": "Stock Received But Not Billed"
}
},
"Duties and Taxes": {
"TDS": {
"account_type": "Tax"
}
},
"Loans (Liabilities)": {
"Secured Loans": {},
"Unsecured Loans": {},
"Bank Overdraft Account": {}
}
},
"root_type": "Liability"
}
}
}

View File

@@ -24,7 +24,8 @@ def get():
"account_type": "Cash"
},
_("Loans and Advances (Assets)"): {
"is_group": 1
_("Employee Advances"): {
},
},
_("Securities and Deposits"): {
_("Earnest Money"): {}
@@ -63,7 +64,10 @@ def get():
},
_("Accumulated Depreciation"): {
"account_type": "Accumulated Depreciation"
}
},
_("CWIP Account"): {
"account_type": "Capital Work in Progress",
}
},
_("Investments"): {
"is_group": 1
@@ -81,6 +85,9 @@ def get():
_("Cost of Goods Sold"): {
"account_type": "Cost of Goods Sold"
},
_("Expenses Included In Asset Valuation"): {
"account_type": "Expenses Included In Asset Valuation"
},
_("Expenses Included In Valuation"): {
"account_type": "Expenses Included In Valuation"
},
@@ -146,6 +153,9 @@ def get():
_("Stock Received But Not Billed"): {
"account_type": "Stock Received But Not Billed"
},
_("Asset Received But Not Billed"): {
"account_type": "Asset Received But Not Billed"
}
},
_("Duties and Taxes"): {
"account_type": "Tax",

View File

@@ -0,0 +1,289 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from frappe import _
def get():
return {
_("Application of Funds (Assets)"): {
_("Current Assets"): {
_("Accounts Receivable"): {
_("Debtors"): {
"account_type": "Receivable",
"account_number": "1310"
},
"account_number": "1300"
},
_("Bank Accounts"): {
"account_type": "Bank",
"is_group": 1,
"account_number": "1200"
},
_("Cash In Hand"): {
_("Cash"): {
"account_type": "Cash",
"account_number": "1110"
},
"account_type": "Cash",
"account_number": "1100"
},
_("Loans and Advances (Assets)"): {
_("Employee Advances"): {
"account_number": "1610"
},
"account_number": "1600"
},
_("Securities and Deposits"): {
_("Earnest Money"): {
"account_number": "1651"
},
"account_number": "1650"
},
_("Stock Assets"): {
_("Stock In Hand"): {
"account_type": "Stock",
"account_number": "1410"
},
"account_type": "Stock",
"account_number": "1400"
},
_("Tax Assets"): {
"is_group": 1,
"account_number": "1500"
},
"account_number": "1100-1600"
},
_("Fixed Assets"): {
_("Capital Equipments"): {
"account_type": "Fixed Asset",
"account_number": "1710"
},
_("Electronic Equipments"): {
"account_type": "Fixed Asset",
"account_number": "1720"
},
_("Furnitures and Fixtures"): {
"account_type": "Fixed Asset",
"account_number": "1730"
},
_("Office Equipments"): {
"account_type": "Fixed Asset",
"account_number": "1740"
},
_("Plants and Machineries"): {
"account_type": "Fixed Asset",
"account_number": "1750"
},
_("Buildings"): {
"account_type": "Fixed Asset",
"account_number": "1760"
},
_("Softwares"): {
"account_type": "Fixed Asset",
"account_number": "1770"
},
_("Accumulated Depreciation"): {
"account_type": "Accumulated Depreciation",
"account_number": "1780"
},
_("CWIP Account"): {
"account_type": "Capital Work in Progress",
"account_number": "1790"
},
"account_number": "1700"
},
_("Investments"): {
"is_group": 1,
"account_number": "1800"
},
_("Temporary Accounts"): {
_("Temporary Opening"): {
"account_type": "Temporary",
"account_number": "1910"
},
"account_number": "1900"
},
"root_type": "Asset",
"account_number": "1000"
},
_("Expenses"): {
_("Direct Expenses"): {
_("Stock Expenses"): {
_("Cost of Goods Sold"): {
"account_type": "Cost of Goods Sold",
"account_number": "5111"
},
_("Expenses Included In Asset Valuation"): {
"account_type": "Expenses Included In Asset Valuation",
"account_number": "5112"
},
_("Expenses Included In Valuation"): {
"account_type": "Expenses Included In Valuation",
"account_number": "5118"
},
_("Stock Adjustment"): {
"account_type": "Stock Adjustment",
"account_number": "5119"
},
"account_number": "5110"
},
"account_number": "5100"
},
_("Indirect Expenses"): {
_("Administrative Expenses"): {
"account_number": "5201"
},
_("Commission on Sales"): {
"account_number": "5202"
},
_("Depreciation"): {
"account_type": "Depreciation",
"account_number": "5203"
},
_("Entertainment Expenses"): {
"account_number": "5204"
},
_("Freight and Forwarding Charges"): {
"account_type": "Chargeable",
"account_number": "5205"
},
_("Legal Expenses"): {
"account_number": "5206"
},
_("Marketing Expenses"): {
"account_type": "Chargeable",
"account_number": "5207"
},
_("Office Maintenance Expenses"): {
"account_number": "5208"
},
_("Office Rent"): {
"account_number": "5209"
},
_("Postal Expenses"): {
"account_number": "5210"
},
_("Print and Stationery"): {
"account_number": "5211"
},
_("Round Off"): {
"account_type": "Round Off",
"account_number": "5212"
},
_("Salary"): {
"account_number": "5213"
},
_("Sales Expenses"): {
"account_number": "5214"
},
_("Telephone Expenses"): {
"account_number": "5215"
},
_("Travel Expenses"): {
"account_number": "5216"
},
_("Utility Expenses"): {
"account_number": "5217"
},
_("Write Off"): {
"account_number": "5218"
},
_("Exchange Gain/Loss"): {
"account_number": "5219"
},
_("Gain/Loss on Asset Disposal"): {
"account_number": "5220"
},
_("Miscellaneous Expenses"): {
"account_type": "Chargeable",
"account_number": "5221"
},
"account_number": "5200"
},
"root_type": "Expense",
"account_number": "5000"
},
_("Income"): {
_("Direct Income"): {
_("Sales"): {
"account_number": "4110"
},
_("Service"): {
"account_number": "4120"
},
"account_number": "4100"
},
_("Indirect Income"): {
"is_group": 1,
"account_number": "4200"
},
"root_type": "Income",
"account_number": "4000"
},
_("Source of Funds (Liabilities)"): {
_("Current Liabilities"): {
_("Accounts Payable"): {
_("Creditors"): {
"account_type": "Payable",
"account_number": "2110"
},
_("Payroll Payable"): {
"account_number": "2120"
},
"account_number": "2100"
},
_("Stock Liabilities"): {
_("Stock Received But Not Billed"): {
"account_type": "Stock Received But Not Billed",
"account_number": "2210"
},
_("Asset Received But Not Billed"): {
"account_type": "Asset Received But Not Billed",
"account_number": "2211"
},
"account_number": "2200"
},
_("Duties and Taxes"): {
"account_type": "Tax",
"is_group": 1,
"account_number": "2300"
},
_("Loans (Liabilities)"): {
_("Secured Loans"): {
"account_number": "2410"
},
_("Unsecured Loans"): {
"account_number": "2420"
},
_("Bank Overdraft Account"): {
"account_number": "2430"
},
"account_number": "2400"
},
"account_number": "2100-2400"
},
"root_type": "Liability",
"account_number": "2000"
},
_("Equity"): {
_("Capital Stock"): {
"account_type": "Equity",
"account_number": "3100"
},
_("Dividends Paid"): {
"account_type": "Equity",
"account_number": "3200"
},
_("Opening Balance Equity"): {
"account_type": "Equity",
"account_number": "3300"
},
_("Retained Earnings"): {
"account_type": "Equity",
"account_number": "3400"
},
"root_type": "Equity",
"account_number": "3000"
}
}

View File

@@ -2,9 +2,113 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import unittest
import frappe
from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
from erpnext.accounts.doctype.account.account import update_account_number
from erpnext.accounts.doctype.account.account import merge_account
class TestAccount(unittest.TestCase):
def test_rename_account(self):
if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Debtors"
acc.parent_account = "Accounts Receivable - _TC"
acc.account_number = "1210"
acc.company = "_Test Company"
acc.insert()
account_number, account_name = frappe.db.get_value("Account", "1210 - Debtors - _TC",
["account_number", "account_name"])
self.assertEqual(account_number, "1210")
self.assertEqual(account_name, "Debtors")
new_account_number = "1211-11-4 - 6 - "
new_account_name = "Debtors 1 - Test - "
update_account_number("1210 - Debtors - _TC", new_account_name, new_account_number)
new_acc = frappe.db.get_value("Account", "1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
["account_name", "account_number"], as_dict=1)
self.assertEqual(new_acc.account_name, "Debtors 1 - Test -")
self.assertEqual(new_acc.account_number, "1211-11-4 - 6 -")
frappe.delete_doc("Account", "1211-11-4 - 6 - Debtors 1 - Test - - _TC")
def test_merge_account(self):
if not frappe.db.exists("Account", "Current Assets - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Current Assets"
acc.is_group = 1
acc.parent_account = "Application of Funds (Assets) - _TC"
acc.company = "_Test Company"
acc.insert()
if not frappe.db.exists("Account", "Securities and Deposits - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Securities and Deposits"
acc.parent_account = "Current Assets - _TC"
acc.is_group = 1
acc.company = "_Test Company"
acc.insert()
if not frappe.db.exists("Account", "Earnest Money - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Earnest Money"
acc.parent_account = "Securities and Deposits - _TC"
acc.company = "_Test Company"
acc.insert()
if not frappe.db.exists("Account", "Cash In Hand - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Cash In Hand"
acc.is_group = 1
acc.parent_account = "Current Assets - _TC"
acc.company = "_Test Company"
acc.insert()
if not frappe.db.exists("Account", "Accumulated Depreciation - _TC"):
acc = frappe.new_doc("Account")
acc.account_name = "Accumulated Depreciation"
acc.parent_account = "Fixed Assets - _TC"
acc.company = "_Test Company"
acc.insert()
doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
self.assertEqual(parent, "Securities and Deposits - _TC")
merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company)
parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
# Parent account of the child account changes after merging
self.assertEqual(parent, "Cash In Hand - _TC")
# Old account doesn't exist after merging
self.assertFalse(frappe.db.exists("Account", "Securities and Deposits - _TC"))
doc = frappe.get_doc("Account", "Current Assets - _TC")
# Raise error as is_group property doesn't match
self.assertRaises(frappe.ValidationError, merge_account, "Current Assets - _TC",\
"Accumulated Depreciation - _TC", doc.is_group, doc.root_type, doc.company)
doc = frappe.get_doc("Account", "Capital Stock - _TC")
# Raise error as root_type property doesn't match
self.assertRaises(frappe.ValidationError, merge_account, "Capital Stock - _TC",\
"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
def test_account_sync(self):
del frappe.local.flags["ignore_root_company_validation"]
acc = frappe.new_doc("Account")
acc.account_name = "Test Sync Account"
acc.parent_account = "Temporary Accounts - _TC3"
acc.company = "_Test Company 3"
acc.insert()
acc_tc_4 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 4"})
acc_tc_5 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 5"})
self.assertEqual(acc_tc_4, "Test Sync Account - _TC4")
self.assertEqual(acc_tc_5, "Test Sync Account - _TC5")
def _make_test_records(verbose):
from frappe.test_runner import make_test_objects
@@ -21,6 +125,7 @@ def _make_test_records(verbose):
["_Test Account Customs Duty", "_Test Account Stock Expenses", 0, "Tax", None],
["_Test Account Insurance Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
["_Test Account Stock Adjustment", "_Test Account Stock Expenses", 0, "Stock Adjustment", None],
["_Test Employee Advance", "Current Liabilities", 0, None, None],
["_Test Account Tax Assets", "Current Assets", 1, None, None],
["_Test Account VAT", "_Test Account Tax Assets", 0, "Tax", None],
@@ -37,9 +142,11 @@ def _make_test_records(verbose):
["_Test Write Off", "Indirect Expenses", 0, None, None],
["_Test Exchange Gain/Loss", "Indirect Expenses", 0, None, None],
["_Test Account Sales", "Direct Income", 0, None, None],
# related to Account Inventory Integration
["_Test Account Stock In Hand", "Current Assets", 0, None, None],
# fixed asset depreciation
["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
["_Test Accumulated Depreciations", "Current Assets", 0, None, None],
@@ -53,7 +160,7 @@ def _make_test_records(verbose):
["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"]
]
for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"]]:
for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"], ["_Test Company with perpetual inventory", "TCP1"]]:
test_objects = make_test_objects("Account", [{
"doctype": "Account",
"account_name": account_name,
@@ -69,20 +176,24 @@ def _make_test_records(verbose):
def get_inventory_account(company, warehouse=None):
account = None
if warehouse:
account = get_warehouse_account(warehouse, company)
account = get_warehouse_account(frappe.get_doc("Warehouse", warehouse))
else:
account = get_company_default_inventory_account(company)
return account
def create_account(**kwargs):
account = frappe.get_doc(dict(
doctype = "Account",
account_name = kwargs.get('account_name'),
account_type = kwargs.get('account_type'),
parent_account = kwargs.get('parent_account'),
company = kwargs.get('company')
))
account.save()
return account.name
account = frappe.db.get_value("Account", filters={"account_name": kwargs.get("account_name"), "company": kwargs.get("company")})
if account:
return account
else:
account = frappe.get_doc(dict(
doctype = "Account",
account_name = kwargs.get('account_name'),
account_type = kwargs.get('account_type'),
parent_account = kwargs.get('parent_account'),
company = kwargs.get('company')
))
account.save()
return account.name

View File

@@ -0,0 +1,29 @@
QUnit.module('accounts');
QUnit.test("test account", function(assert) {
assert.expect(4);
let done = assert.async();
frappe.run_serially([
() => frappe.set_route('Tree', 'Account'),
() => frappe.timeout(3),
() => frappe.click_button('Expand All'),
() => frappe.timeout(1),
() => frappe.click_link('Debtors'),
() => frappe.click_button('Edit'),
() => frappe.timeout(1),
() => {
assert.ok(cur_frm.doc.root_type=='Asset');
assert.ok(cur_frm.doc.report_type=='Balance Sheet');
assert.ok(cur_frm.doc.account_type=='Receivable');
},
() => frappe.click_button('Ledger'),
() => frappe.timeout(1),
() => {
// check if general ledger report shown
assert.deepEqual(frappe.get_route(), ['query-report', 'General Ledger']);
window.history.back();
return frappe.timeout(1);
},
() => done()
]);
});

View File

@@ -0,0 +1,69 @@
QUnit.module('accounts');
QUnit.test("test account with number", function(assert) {
assert.expect(7);
let done = assert.async();
frappe.run_serially([
() => frappe.set_route('Tree', 'Account'),
() => frappe.click_link('Income'),
() => frappe.click_button('Add Child'),
() => frappe.timeout(.5),
() => {
cur_dialog.fields_dict.account_name.$input.val("Test Income");
cur_dialog.fields_dict.account_number.$input.val("4010");
},
() => frappe.click_button('Create New'),
() => frappe.timeout(1),
() => {
assert.ok($('a:contains("4010 - Test Income"):visible').length!=0, "Account created with number");
},
() => frappe.click_link('4010 - Test Income'),
() => frappe.click_button('Edit'),
() => frappe.timeout(.5),
() => frappe.click_button('Update Account Number'),
() => frappe.timeout(.5),
() => {
cur_dialog.fields_dict.account_number.$input.val("4020");
},
() => frappe.timeout(1),
() => cur_dialog.primary_action(),
() => frappe.timeout(1),
() => cur_frm.refresh_fields(),
() => frappe.timeout(.5),
() => {
var abbr = frappe.get_abbr(frappe.defaults.get_default("Company"));
var new_account = "4020 - Test Income - " + abbr;
assert.ok(cur_frm.doc.name==new_account, "Account renamed");
assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
assert.ok(cur_frm.doc.account_number=="4020", "Account number updated to 4020");
},
() => frappe.timeout(1),
() => frappe.click_button('Menu'),
() => frappe.click_link('Rename'),
() => frappe.timeout(.5),
() => {
cur_dialog.fields_dict.new_name.$input.val("4030 - Test Income");
},
() => frappe.timeout(.5),
() => frappe.click_button("Rename"),
() => frappe.timeout(2),
() => {
assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
assert.ok(cur_frm.doc.account_number=="4030", "Account number updated to 4030");
},
() => frappe.timeout(.5),
() => frappe.click_button('Chart of Accounts'),
() => frappe.timeout(.5),
() => frappe.click_button('Menu'),
() => frappe.click_link('Refresh'),
() => frappe.click_button('Expand All'),
() => frappe.click_link('4030 - Test Income'),
() => frappe.click_button('Delete'),
() => frappe.click_button('Yes'),
() => frappe.timeout(.5),
() => {
assert.ok($('a:contains("4030 - Test Account"):visible').length==0, "Account deleted");
},
() => done()
]);
});

View File

@@ -0,0 +1,46 @@
QUnit.module('accounts');
QUnit.test("test account", assert => {
assert.expect(3);
let done = assert.async();
frappe.run_serially([
() => frappe.set_route('Tree', 'Account'),
() => frappe.click_button('Expand All'),
() => frappe.click_link('Duties and Taxes - '+ frappe.get_abbr(frappe.defaults.get_default("Company"))),
() => {
if($('a:contains("CGST"):visible').length == 0){
return frappe.map_tax.make('CGST', 9);
}
},
() => {
if($('a:contains("SGST"):visible').length == 0){
return frappe.map_tax.make('SGST', 9);
}
},
() => {
if($('a:contains("IGST"):visible').length == 0){
return frappe.map_tax.make('IGST', 18);
}
},
() => {
assert.ok($('a:contains("CGST"):visible').length!=0, "CGST Checked");
assert.ok($('a:contains("SGST"):visible').length!=0, "SGST Checked");
assert.ok($('a:contains("IGST"):visible').length!=0, "IGST Checked");
},
() => done()
]);
});
frappe.map_tax = {
make:function(text,rate){
return frappe.run_serially([
() => frappe.click_button('Add Child'),
() => frappe.timeout(0.2),
() => cur_dialog.set_value('account_name',text),
() => cur_dialog.set_value('account_type','Tax'),
() => cur_dialog.set_value('tax_rate',rate),
() => cur_dialog.set_value('account_currency','INR'),
() => frappe.click_button('Create New'),
]);
}
};

View File

@@ -0,0 +1,8 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Account Subtype', {
refresh: function() {
}
});

View File

@@ -0,0 +1,134 @@
{
"allow_copy": 0,
"allow_events_in_timeline": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:account_subtype",
"beta": 0,
"creation": "2018-10-25 15:46:08.054586",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "account_subtype",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Account Subtype",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 1
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-10-25 15:47:03.841390",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account Subtype",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0,
"track_views": 0
}

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe.model.document import Document
class AccountSubtype(Document):
pass

View File

@@ -0,0 +1,23 @@
/* eslint-disable */
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
QUnit.test("test: Account Subtype", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
// insert a new Account Subtype
() => frappe.tests.make('Account Subtype', [
// values to be set
{key: 'value'}
]),
() => {
assert.equal(cur_frm.doc.key, 'value');
},
() => done()
]);
});

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest
class TestAccountSubtype(unittest.TestCase):
pass

View File

@@ -0,0 +1,8 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Account Type', {
refresh: function() {
}
});

View File

@@ -0,0 +1,134 @@
{
"allow_copy": 0,
"allow_events_in_timeline": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:account_type",
"beta": 0,
"creation": "2018-10-25 15:45:45.789963",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "account_type",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Account Type",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 1
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-10-25 15:46:51.042604",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account Type",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0,
"track_views": 0
}

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe.model.document import Document
class AccountType(Document):
pass

View File

@@ -0,0 +1,23 @@
/* eslint-disable */
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
QUnit.test("test: Account Type", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
// insert a new Account Type
() => frappe.tests.make('Account Type', [
// values to be set
{key: 'value'}
]),
() => {
assert.equal(cur_frm.doc.key, 'value');
},
() => done()
]);
});

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest
class TestAccountType(unittest.TestCase):
pass

View File

@@ -0,0 +1,70 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Accounting Dimension', {
refresh: function(frm) {
frm.set_query('document_type', () => {
let invalid_doctypes = frappe.model.core_doctypes_list;
invalid_doctypes.push('Accounting Dimension', 'Project',
'Cost Center', 'Accounting Dimension Detail');
return {
filters: {
name: ['not in', invalid_doctypes]
}
};
});
if (!frm.is_new()) {
frm.add_custom_button(__('Show {0}', [frm.doc.document_type]), function () {
frappe.set_route("List", frm.doc.document_type);
});
let button = frm.doc.disabled ? "Enable" : "Disable";
frm.add_custom_button(__(button), function() {
frm.set_value('disabled', 1 - frm.doc.disabled);
frappe.call({
method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
args: {
doc: frm.doc
},
freeze: true,
callback: function(r) {
let message = frm.doc.disabled ? "Dimension Disabled" : "Dimension Enabled";
frm.save();
frappe.show_alert({message:__(message), indicator:'green'});
}
});
});
}
},
document_type: function(frm) {
frm.set_value('label', frm.doc.document_type);
frm.set_value('fieldname', frappe.model.scrub(frm.doc.document_type));
if (frm.is_new()){
let row = frappe.model.add_child(frm.doc, "Accounting Dimension Detail", "dimension_defaults");
row.reference_document = frm.doc.document_type;
frm.refresh_fields("dimension_defaults");
}
frappe.db.get_value('Accounting Dimension', {'document_type': frm.doc.document_type}, 'document_type', (r) => {
if (r && r.document_type) {
frm.set_df_property('document_type', 'description', "Document type is already set as dimension");
}
});
},
});
frappe.ui.form.on('Accounting Dimension Detail', {
dimension_defaults_add: function(frm, cdt, cdn) {
let row = locals[cdt][cdn];
row.reference_document = frm.doc.document_type;
}
});

View File

@@ -0,0 +1,72 @@
{
"autoname": "field:label",
"creation": "2019-05-04 18:13:37.002352",
"doctype": "DocType",
"engine": "InnoDB",
"field_order": [
"document_type",
"label",
"fieldname",
"dimension_defaults",
"disabled"
],
"fields": [
{
"fieldname": "label",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Dimension Name",
"unique": 1
},
{
"fieldname": "fieldname",
"fieldtype": "Data",
"hidden": 1,
"label": "Fieldname"
},
{
"fieldname": "document_type",
"fieldtype": "Link",
"label": "Reference Document Type",
"options": "DocType",
"reqd": 1
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
"hidden": 1,
"label": "Disable",
"read_only": 1
},
{
"fieldname": "dimension_defaults",
"fieldtype": "Table",
"label": "Dimension Defaults",
"options": "Accounting Dimension Detail"
}
],
"modified": "2019-07-17 16:49:31.134385",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting Dimension",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "ASC",
"track_changes": 1
}

View File

@@ -0,0 +1,205 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
import json
from frappe.model.document import Document
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe import scrub
from frappe.utils import cstr
from frappe.utils.background_jobs import enqueue
from frappe.model import core_doctypes_list
class AccountingDimension(Document):
def before_insert(self):
self.set_fieldname_and_label()
def validate(self):
if self.document_type in core_doctypes_list + ('Accounting Dimension', 'Project',
'Cost Center', 'Accounting Dimension Detail') :
msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
frappe.throw(msg)
exists = frappe.db.get_value("Accounting Dimension", {'document_type': self.document_type}, ['name'])
if exists and self.is_new():
frappe.throw("Document Type already used as a dimension")
def after_insert(self):
if frappe.flags.in_test:
make_dimension_in_accounting_doctypes(doc=self)
else:
frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self)
def on_trash(self):
if frappe.flags.in_test:
delete_accounting_dimension(doc=self)
else:
frappe.enqueue(delete_accounting_dimension, doc=self)
def set_fieldname_and_label(self):
if not self.label:
self.label = cstr(self.document_type)
if not self.fieldname:
self.fieldname = scrub(self.label)
def make_dimension_in_accounting_doctypes(doc):
doclist = get_doctypes_with_dimensions()
doc_count = len(get_accounting_dimensions())
count = 0
for doctype in doclist:
if (doc_count + 1) % 2 == 0:
insert_after_field = 'dimension_col_break'
else:
insert_after_field = 'accounting_dimensions_section'
df = {
"fieldname": doc.fieldname,
"label": doc.label,
"fieldtype": "Link",
"options": doc.document_type,
"insert_after": insert_after_field,
"owner": "Administrator"
}
if doctype == "Budget":
add_dimension_to_budget_doctype(df, doc)
else:
create_custom_field(doctype, df)
count += 1
frappe.publish_progress(count*100/len(doclist), title = _("Creating Dimensions..."))
frappe.clear_cache(doctype=doctype)
def add_dimension_to_budget_doctype(df, doc):
df.update({
"insert_after": "cost_center",
"depends_on": "eval:doc.budget_against == '{0}'".format(doc.document_type)
})
create_custom_field("Budget", df)
property_setter = frappe.db.exists("Property Setter", "Budget-budget_against-options")
if property_setter:
property_setter_doc = frappe.get_doc("Property Setter", "Budget-budget_against-options")
property_setter_doc.value = property_setter_doc.value + "\n" + doc.document_type
property_setter_doc.save()
frappe.clear_cache(doctype='Budget')
else:
frappe.get_doc({
"doctype": "Property Setter",
"doctype_or_field": "DocField",
"doc_type": "Budget",
"field_name": "budget_against",
"property": "options",
"property_type": "Text",
"value": "\nCost Center\nProject\n" + doc.document_type
}).insert(ignore_permissions=True)
def delete_accounting_dimension(doc):
doclist = get_doctypes_with_dimensions()
frappe.db.sql("""
DELETE FROM `tabCustom Field`
WHERE fieldname = %s
AND dt IN (%s)""" % #nosec
('%s', ', '.join(['%s']* len(doclist))), tuple([doc.fieldname] + doclist))
frappe.db.sql("""
DELETE FROM `tabProperty Setter`
WHERE field_name = %s
AND doc_type IN (%s)""" % #nosec
('%s', ', '.join(['%s']* len(doclist))), tuple([doc.fieldname] + doclist))
budget_against_property = frappe.get_doc("Property Setter", "Budget-budget_against-options")
value_list = budget_against_property.value.split('\n')[3:]
if doc.document_type in value_list:
value_list.remove(doc.document_type)
budget_against_property.value = "\nCost Center\nProject\n" + "\n".join(value_list)
budget_against_property.save()
for doctype in doclist:
frappe.clear_cache(doctype=doctype)
@frappe.whitelist()
def disable_dimension(doc):
if frappe.flags.in_test:
toggle_disabling(doc=doc)
else:
frappe.enqueue(toggle_disabling, doc=doc)
def toggle_disabling(doc):
doc = json.loads(doc)
if doc.get('disabled'):
df = {"read_only": 1}
else:
df = {"read_only": 0}
doclist = get_doctypes_with_dimensions()
for doctype in doclist:
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": doc.get('fieldname')})
if field:
custom_field = frappe.get_doc("Custom Field", field)
custom_field.update(df)
custom_field.save()
frappe.clear_cache(doctype=doctype)
def get_doctypes_with_dimensions():
doclist = ["GL Entry", "Sales Invoice", "Purchase Invoice", "Payment Entry", "Asset",
"Expense Claim", "Stock Entry", "Budget", "Payroll Entry", "Delivery Note", "Sales Invoice Item", "Purchase Invoice Item",
"Purchase Order Item", "Journal Entry Account", "Material Request Item", "Delivery Note Item", "Purchase Receipt Item",
"Stock Entry Detail", "Payment Entry Deduction", "Sales Taxes and Charges", "Purchase Taxes and Charges", "Shipping Rule",
"Landed Cost Item", "Asset Value Adjustment", "Loyalty Program", "Fee Schedule", "Fee Structure", "Stock Reconciliation",
"Travel Request", "Fees", "POS Profile", "Opening Invoice Creation Tool", "Opening Invoice Creation Tool Item", "Subscription",
"Subscription Plan"]
return doclist
def get_accounting_dimensions(as_list=True):
accounting_dimensions = frappe.get_all("Accounting Dimension", fields=["label", "fieldname", "disabled"])
if as_list:
return [d.fieldname for d in accounting_dimensions]
else:
return accounting_dimensions
def get_checks_for_pl_and_bs_accounts():
dimensions = frappe.db.sql("""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
WHERE p.name = c.parent""", as_dict=1)
return dimensions
@frappe.whitelist()
def get_dimension_filters():
dimension_filters = frappe.db.sql("""
SELECT label, fieldname, document_type
FROM `tabAccounting Dimension`
WHERE disabled = 0
""", as_dict=1)
default_dimensions = frappe.db.sql("""SELECT parent, company, default_dimension
FROM `tabAccounting Dimension Detail`""", as_dict=1)
default_dimensions_map = {}
for dimension in default_dimensions:
default_dimensions_map.setdefault(dimension['company'], {})
default_dimensions_map[dimension['company']][dimension['parent']] = dimension['default_dimension']
return dimension_filters, default_dimensions_map

View File

@@ -0,0 +1,114 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import frappe
import unittest
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import delete_accounting_dimension
class TestAccountingDimension(unittest.TestCase):
def setUp(self):
frappe.set_user("Administrator")
if not frappe.db.exists("Accounting Dimension", {"document_type": "Department"}):
dimension = frappe.get_doc({
"doctype": "Accounting Dimension",
"document_type": "Department",
}).insert()
else:
dimension1 = frappe.get_doc("Accounting Dimension", "Department")
dimension1.disabled = 0
dimension1.save()
if not frappe.db.exists("Accounting Dimension", {"document_type": "Location"}):
dimension1 = frappe.get_doc({
"doctype": "Accounting Dimension",
"document_type": "Location",
})
dimension1.append("dimension_defaults", {
"company": "_Test Company",
"reference_document": "Location",
"default_dimension": "Block 1",
"mandatory_for_bs": 1
})
dimension1.insert()
dimension1.save()
else:
dimension1 = frappe.get_doc("Accounting Dimension", "Location")
dimension1.disabled = 0
dimension1.save()
def test_dimension_against_sales_invoice(self):
si = create_sales_invoice(do_not_save=1)
si.location = "Block 1"
si.append("items", {
"item_code": "_Test Item",
"warehouse": "_Test Warehouse - _TC",
"qty": 1,
"rate": 100,
"income_account": "Sales - _TC",
"expense_account": "Cost of Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC",
"department": "_Test Department - _TC",
"location": "Block 1"
})
si.save()
si.submit()
gle = frappe.get_doc("GL Entry", {"voucher_no": si.name, "account": "Sales - _TC"})
self.assertEqual(gle.get('department'), "_Test Department - _TC")
def test_dimension_against_journal_entry(self):
je = make_journal_entry("Sales - _TC", "Sales Expenses - _TC", 500, save=False)
je.accounts[0].update({"department": "_Test Department - _TC"})
je.accounts[1].update({"department": "_Test Department - _TC"})
je.accounts[0].update({"location": "Block 1"})
je.accounts[1].update({"location": "Block 1"})
je.save()
je.submit()
gle = frappe.get_doc("GL Entry", {"voucher_no": je.name, "account": "Sales - _TC"})
gle1 = frappe.get_doc("GL Entry", {"voucher_no": je.name, "account": "Sales Expenses - _TC"})
self.assertEqual(gle.get('department'), "_Test Department - _TC")
self.assertEqual(gle1.get('department'), "_Test Department - _TC")
def test_mandatory(self):
si = create_sales_invoice(do_not_save=1)
si.append("items", {
"item_code": "_Test Item",
"warehouse": "_Test Warehouse - _TC",
"qty": 1,
"rate": 100,
"income_account": "Sales - _TC",
"expense_account": "Cost of Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC",
"location": ""
})
si.save()
self.assertRaises(frappe.ValidationError, si.submit)
def tearDown(self):
disable_dimension()
def disable_dimension():
dimension1 = frappe.get_doc("Accounting Dimension", "Department")
dimension1.disabled = 1
dimension1.save()
dimension2 = frappe.get_doc("Accounting Dimension", "Location")
dimension2.disabled = 1
dimension2.save()

View File

@@ -0,0 +1,65 @@
{
"creation": "2019-07-16 17:53:18.718831",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"company",
"reference_document",
"default_dimension",
"mandatory_for_bs",
"mandatory_for_pl"
],
"fields": [
{
"columns": 2,
"fieldname": "company",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Company",
"options": "Company"
},
{
"fieldname": "reference_document",
"fieldtype": "Link",
"hidden": 1,
"label": "Reference Document",
"options": "DocType",
"read_only": 1
},
{
"columns": 2,
"fieldname": "default_dimension",
"fieldtype": "Dynamic Link",
"in_list_view": 1,
"label": "Default Dimension",
"options": "reference_document"
},
{
"columns": 3,
"default": "0",
"fieldname": "mandatory_for_bs",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Mandatory For Balance Sheet"
},
{
"columns": 3,
"default": "0",
"fieldname": "mandatory_for_pl",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Mandatory For Profit and Loss Account"
}
],
"istable": 1,
"modified": "2019-08-15 11:59:09.389891",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting Dimension Detail",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}

View File

@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document
class AccountingDimensionDetail(Document):
pass

View File

@@ -0,0 +1,24 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Accounting Period', {
onload: function(frm) {
if(frm.doc.closed_documents.length === 0 || (frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)) {
frappe.call({
method: "get_doctypes_for_closing",
doc:frm.doc,
callback: function(r) {
if(r.message) {
cur_frm.clear_table("closed_documents");
r.message.forEach(function(element) {
var c = frm.add_child("closed_documents");
c.document_type = element.document_type;
c.closed = element.closed;
});
refresh_field("closed_documents");
}
}
});
}
}
});

View File

@@ -0,0 +1,317 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"autoname": "field:period_name",
"beta": 0,
"creation": "2018-04-13 18:50:14.672323",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "period_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Period Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "start_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Start Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "end_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "section_break_7",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "closed_documents",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Closed Documents",
"length": 0,
"no_copy": 0,
"options": "Closed Document",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2019-08-01 19:14:47.593753",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting Period",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
}

View File

@@ -0,0 +1,58 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
from frappe import _
class OverlapError(frappe.ValidationError): pass
class AccountingPeriod(Document):
def validate(self):
self.validate_overlap()
def before_insert(self):
self.bootstrap_doctypes_for_closing()
def autoname(self):
company_abbr = frappe.get_cached_value('Company', self.company, "abbr")
self.name = " - ".join([self.period_name, company_abbr])
def validate_overlap(self):
existing_accounting_period = frappe.db.sql("""select name from `tabAccounting Period`
where (
(%(start_date)s between start_date and end_date)
or (%(end_date)s between start_date and end_date)
or (start_date between %(start_date)s and %(end_date)s)
or (end_date between %(start_date)s and %(end_date)s)
) and name!=%(name)s and company=%(company)s""",
{
"start_date": self.start_date,
"end_date": self.end_date,
"name": self.name,
"company": self.company
}, as_dict=True)
if len(existing_accounting_period) > 0:
frappe.throw(_("Accounting Period overlaps with {0}")
.format(existing_accounting_period[0].get("name")), OverlapError)
def get_doctypes_for_closing(self):
docs_for_closing = []
doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", \
"Bank Reconciliation", "Asset", "Stock Entry"]
closed_doctypes = [{"document_type": doctype, "closed": 1} for doctype in doctypes]
for closed_doctype in closed_doctypes:
docs_for_closing.append(closed_doctype)
return docs_for_closing
def bootstrap_doctypes_for_closing(self):
if len(self.closed_documents) == 0:
for doctype_for_closing in self.get_doctypes_for_closing():
self.append('closed_documents', {
"document_type": doctype_for_closing.document_type,
"closed": doctype_for_closing.closed
})

View File

@@ -0,0 +1,23 @@
/* eslint-disable */
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
QUnit.test("test: Accounting Period", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
// insert a new Accounting Period
() => frappe.tests.make('Accounting Period', [
// values to be set
{key: 'value'}
]),
() => {
assert.equal(cur_frm.doc.key, 'value');
},
() => done()
]);
});

View File

@@ -0,0 +1,46 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import frappe
import unittest
from frappe.utils import nowdate, add_months
from erpnext.accounts.general_ledger import ClosedAccountingPeriod
from erpnext.accounts.doctype.accounting_period.accounting_period import OverlapError
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
class TestAccountingPeriod(unittest.TestCase):
def test_overlap(self):
ap1 = create_accounting_period(start_date = "2018-04-01",
end_date = "2018-06-30", company = "Wind Power LLC")
ap1.save()
ap2 = create_accounting_period(start_date = "2018-06-30",
end_date = "2018-07-10", company = "Wind Power LLC", period_name = "Test Accounting Period 1")
self.assertRaises(OverlapError, ap2.save)
def test_accounting_period(self):
ap1 = create_accounting_period(period_name = "Test Accounting Period 2")
ap1.save()
doc = create_sales_invoice(do_not_submit=1, cost_center = "_Test Company - _TC", warehouse = "Stores - _TC")
self.assertRaises(ClosedAccountingPeriod, doc.submit)
def tearDown(self):
for d in frappe.get_all("Accounting Period"):
frappe.delete_doc("Accounting Period", d.name)
def create_accounting_period(**args):
args = frappe._dict(args)
accounting_period = frappe.new_doc("Accounting Period")
accounting_period.start_date = args.start_date or nowdate()
accounting_period.end_date = args.end_date or add_months(nowdate(), 1)
accounting_period.company = args.company or "_Test Company"
accounting_period.period_name =args.period_name or "_Test_Period_Name_1"
accounting_period.append("closed_documents", {
"document_type": 'Sales Invoice', "closed": 1
})
return accounting_period

View File

@@ -1,336 +1,210 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2013-06-24 15:49:57",
"custom": 0,
"description": "Settings for Accounts",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Other",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "1",
"description": "If enabled, the system will post accounting entries for inventory automatically.",
"fieldname": "auto_accounting_for_stock",
"fieldtype": "Check",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Make Accounting Entry For Every Stock Movement",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
"fieldname": "acc_frozen_upto",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Accounts Frozen Upto",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
"fieldname": "frozen_accounts_modifier",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
"length": 0,
"no_copy": 0,
"options": "Role",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Role that is allowed to submit transactions that exceed credit limits set.",
"fieldname": "credit_controller",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Credit Controller",
"length": 0,
"no_copy": 0,
"options": "Role",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "check_supplier_invoice_uniqueness",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Check Supplier Invoice Number Uniqueness",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "make_payment_via_journal_entry",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Make Payment via Journal Entry",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "1",
"fieldname": "unlink_payment_on_cancellation_of_invoice",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Unlink Payment on Cancellation of Invoice",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "1",
"fieldname": "book_asset_depreciation_entry_automatically",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Book Asset Depreciation Entry Automatically",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
"creation": "2013-06-24 15:49:57",
"description": "Settings for Accounts",
"doctype": "DocType",
"document_type": "Other",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"auto_accounting_for_stock",
"acc_frozen_upto",
"frozen_accounts_modifier",
"determine_address_tax_category_from",
"over_billing_allowance",
"column_break_4",
"credit_controller",
"check_supplier_invoice_uniqueness",
"make_payment_via_journal_entry",
"unlink_payment_on_cancellation_of_invoice",
"unlink_advance_payment_on_cancelation_of_order",
"book_asset_depreciation_entry_automatically",
"allow_cost_center_in_entry_of_bs_account",
"add_taxes_from_item_tax_template",
"automatically_fetch_payment_terms",
"print_settings",
"show_inclusive_tax_in_print",
"column_break_12",
"show_payment_schedule_in_print",
"currency_exchange_section",
"allow_stale",
"stale_days",
"report_settings_sb",
"use_custom_cash_flow"
],
"fields": [
{
"default": "1",
"description": "If enabled, the system will post accounting entries for inventory automatically.",
"fieldname": "auto_accounting_for_stock",
"fieldtype": "Check",
"hidden": 1,
"in_list_view": 1,
"label": "Make Accounting Entry For Every Stock Movement"
},
{
"description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
"fieldname": "acc_frozen_upto",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Accounts Frozen Upto"
},
{
"description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
"fieldname": "frozen_accounts_modifier",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
"options": "Role"
},
{
"default": "Billing Address",
"description": "Address used to determine Tax Category in transactions.",
"fieldname": "determine_address_tax_category_from",
"fieldtype": "Select",
"label": "Determine Address Tax Category From",
"options": "Billing Address\nShipping Address"
},
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
},
{
"description": "Role that is allowed to submit transactions that exceed credit limits set.",
"fieldname": "credit_controller",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Credit Controller",
"options": "Role"
},
{
"fieldname": "check_supplier_invoice_uniqueness",
"fieldtype": "Check",
"label": "Check Supplier Invoice Number Uniqueness"
},
{
"fieldname": "make_payment_via_journal_entry",
"fieldtype": "Check",
"label": "Make Payment via Journal Entry"
},
{
"default": "1",
"fieldname": "unlink_payment_on_cancellation_of_invoice",
"fieldtype": "Check",
"label": "Unlink Payment on Cancellation of Invoice"
},
{
"default": "1",
"fieldname": "unlink_advance_payment_on_cancelation_of_order",
"fieldtype": "Check",
"label": "Unlink Advance Payment on Cancelation of Order"
},
{
"default": "1",
"fieldname": "book_asset_depreciation_entry_automatically",
"fieldtype": "Check",
"label": "Book Asset Depreciation Entry Automatically"
},
{
"fieldname": "allow_cost_center_in_entry_of_bs_account",
"fieldtype": "Check",
"label": "Allow Cost Center In Entry of Balance Sheet Account"
},
{
"default": "1",
"fieldname": "add_taxes_from_item_tax_template",
"fieldtype": "Check",
"label": "Automatically Add Taxes and Charges from Item Tax Template"
},
{
"fieldname": "print_settings",
"fieldtype": "Section Break",
"label": "Print Settings"
},
{
"fieldname": "show_inclusive_tax_in_print",
"fieldtype": "Check",
"label": "Show Inclusive Tax In Print"
},
{
"fieldname": "column_break_12",
"fieldtype": "Column Break"
},
{
"fieldname": "show_payment_schedule_in_print",
"fieldtype": "Check",
"label": "Show Payment Schedule in Print"
},
{
"fieldname": "currency_exchange_section",
"fieldtype": "Section Break",
"label": "Currency Exchange Settings"
},
{
"default": "1",
"fieldname": "allow_stale",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Allow Stale Exchange Rates"
},
{
"default": "1",
"depends_on": "eval:doc.allow_stale==0",
"fieldname": "stale_days",
"fieldtype": "Int",
"label": "Stale Days"
},
{
"fieldname": "report_settings_sb",
"fieldtype": "Section Break",
"label": "Report Settings"
},
{
"default": "0",
"description": "Only select if you have setup Cash Flow Mapper documents",
"fieldname": "use_custom_cash_flow",
"fieldtype": "Check",
"label": "Use Custom Cash Flow Format"
},
{
"fieldname": "automatically_fetch_payment_terms",
"fieldtype": "Check",
"label": "Automatically Fetch Payment Terms"
},
{
"description": "Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.",
"fieldname": "over_billing_allowance",
"fieldtype": "Currency",
"label": "Over Billing Allowance (%)"
}
],
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
"modified": "2019-07-04 18:20:55.789946",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"email": 1,
"print": 1,
"read": 1,
"role": "Accounts Manager",
"share": 1,
"write": 1
},
{
"read": 1,
"role": "Sales User"
},
{
"read": 1,
"role": "Purchase User"
}
],
"quick_entry": 1,
"sort_order": "ASC",
"track_changes": 1
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2017-06-16 17:39:50.614522",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_order": "ASC",
"track_changes": 1,
"track_seen": 0
}

View File

@@ -5,10 +5,36 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cint, comma_and
from frappe.utils import cint
from frappe.model.document import Document
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
class AccountsSettings(Document):
def on_update(self):
pass
frappe.clear_cache()
def validate(self):
frappe.db.set_default("add_taxes_from_item_tax_template",
self.get("add_taxes_from_item_tax_template", 0))
self.validate_stale_days()
self.enable_payment_schedule_in_print()
self.enable_fields_for_cost_center_settings()
def validate_stale_days(self):
if not self.allow_stale and cint(self.stale_days) <= 0:
frappe.msgprint(
"Stale Days should start from 1.", title='Error', indicator='red',
raise_exception=1)
def enable_payment_schedule_in_print(self):
show_in_print = cint(self.show_payment_schedule_in_print)
for doctype in ("Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"):
make_property_setter(doctype, "due_date", "print_hide", show_in_print, "Check")
make_property_setter(doctype, "payment_schedule", "print_hide", 0 if show_in_print else 1, "Check")
def enable_fields_for_cost_center_settings(self):
show_field = 0 if cint(self.allow_cost_center_in_entry_of_bs_account) else 1
for doctype in ("Sales Invoice", "Purchase Invoice", "Payment Entry"):
make_property_setter(doctype, "cost_center", "hidden", show_field, "Check")

View File

@@ -0,0 +1,35 @@
QUnit.module('accounts');
QUnit.test("test: Accounts Settings doesn't allow negatives", function (assert) {
let done = assert.async();
assert.expect(2);
frappe.run_serially([
() => frappe.set_route('Form', 'Accounts Settings', 'Accounts Settings'),
() => frappe.timeout(2),
() => unchecked_if_checked(cur_frm, 'Allow Stale Exchange Rates', frappe.click_check),
() => cur_frm.set_value('stale_days', 0),
() => frappe.click_button('Save'),
() => frappe.timeout(2),
() => {
assert.ok(cur_dialog);
},
() => frappe.click_button('Close'),
() => cur_frm.set_value('stale_days', -1),
() => frappe.click_button('Save'),
() => frappe.timeout(2),
() => {
assert.ok(cur_dialog);
},
() => frappe.click_button('Close'),
() => done()
]);
});
const unchecked_if_checked = function(frm, field_name, fn){
if (frm.doc.allow_stale) {
return fn(field_name);
}
};

View File

@@ -0,0 +1,23 @@
from __future__ import unicode_literals
import unittest
import frappe
class TestAccountsSettings(unittest.TestCase):
def tearDown(self):
# Just in case `save` method succeeds, we need to take things back to default so that other tests
# don't break
cur_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
cur_settings.allow_stale = 1
cur_settings.save()
def test_stale_days(self):
cur_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
cur_settings.allow_stale = 0
cur_settings.stale_days = 0
self.assertRaises(frappe.ValidationError, cur_settings.save)
cur_settings.stale_days = -1
self.assertRaises(frappe.ValidationError, cur_settings.save)

View File

@@ -0,0 +1,74 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2018-04-16 21:50:05.860195",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "",
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2018-04-20 14:00:46.014502",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Allowed To Transact With",
"name_case": "",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
}

View File

@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe.model.document import Document
class AllowedToTransactWith(Document):
pass

View File

@@ -1,310 +0,0 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.provide("erpnext.asset");
frappe.ui.form.on('Asset', {
onload: function(frm) {
frm.set_query("item_code", function() {
return {
"filters": {
"disabled": 0,
"is_fixed_asset": 1,
"is_stock_item": 0
}
};
});
frm.set_query("warehouse", function() {
return {
"filters": {
"company": frm.doc.company,
"is_group": 0
}
};
});
},
refresh: function(frm) {
frappe.ui.form.trigger("Asset", "is_existing_asset");
frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
frm.events.make_schedules_editable(frm);
if (frm.doc.docstatus==1) {
if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
frm.add_custom_button("Make Purchase Invoice", function() {
erpnext.asset.make_purchase_invoice(frm);
});
}
if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
frm.add_custom_button("Transfer Asset", function() {
erpnext.asset.transfer_asset(frm);
});
frm.add_custom_button("Scrap Asset", function() {
erpnext.asset.scrap_asset(frm);
});
frm.add_custom_button("Sell Asset", function() {
erpnext.asset.make_sales_invoice(frm);
});
} else if (frm.doc.status=='Scrapped') {
frm.add_custom_button("Restore Asset", function() {
erpnext.asset.restore_asset(frm);
});
}
frm.trigger("show_graph");
}
},
show_graph: function(frm) {
var x_intervals = ["x", frm.doc.purchase_date];
var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
var last_depreciation_date = frm.doc.purchase_date;
if(frm.doc.opening_accumulated_depreciation) {
last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
-1*frm.doc.frequency_of_depreciation);
x_intervals.push(last_depreciation_date);
asset_values.push(flt(frm.doc.gross_purchase_amount) -
flt(frm.doc.opening_accumulated_depreciation));
}
$.each(frm.doc.schedules || [], function(i, v) {
x_intervals.push(v.schedule_date);
var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
if(v.journal_entry) {
last_depreciation_date = v.schedule_date;
asset_values.push(asset_value)
} else {
if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
asset_values.push(null)
} else {
asset_values.push(asset_value)
}
}
})
if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
x_intervals.push(frm.doc.disposal_date);
asset_values.push(0);
last_depreciation_date = frm.doc.disposal_date;
}
frm.dashboard.setup_chart({
data: {
x: 'x',
columns: [x_intervals, asset_values],
regions: {
'Asset Value': [{'start': last_depreciation_date, 'style':'dashed'}]
}
},
legend: {
show: false
},
axis: {
x: {
type: 'timeseries',
tick: {
format: "%d-%m-%Y"
}
},
y: {
min: 0,
padding: {bottom: 10}
}
}
});
},
item_code: function(frm) {
if(frm.doc.item_code) {
frappe.call({
method: "erpnext.accounts.doctype.asset.asset.get_item_details",
args: {
item_code: frm.doc.item_code
},
callback: function(r, rt) {
if(r.message) {
$.each(r.message, function(field, value) {
frm.set_value(field, value);
})
}
}
})
}
},
is_existing_asset: function(frm) {
frm.toggle_enable("supplier", frm.doc.is_existing_asset);
frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
},
opening_accumulated_depreciation: function(frm) {
erpnext.asset.set_accululated_depreciation(frm);
},
depreciation_method: function(frm) {
frm.events.make_schedules_editable(frm);
},
make_schedules_editable: function(frm) {
var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
frm.toggle_enable("schedules", is_editable);
frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
}
});
frappe.ui.form.on('Depreciation Schedule', {
make_depreciation_entry: function(frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (!row.journal_entry) {
frappe.call({
method: "erpnext.accounts.doctype.asset.depreciation.make_depreciation_entry",
args: {
"asset_name": frm.doc.name,
"date": row.schedule_date
},
callback: function(r) {
frappe.model.sync(r.message);
frm.refresh();
}
})
}
},
depreciation_amount: function(frm, cdt, cdn) {
erpnext.asset.set_accululated_depreciation(frm);
}
})
erpnext.asset.set_accululated_depreciation = function(frm) {
if(frm.doc.depreciation_method != "Manual") return;
var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
$.each(frm.doc.schedules || [], function(i, row) {
accumulated_depreciation += flt(row.depreciation_amount);
frappe.model.set_value(row.doctype, row.name,
"accumulated_depreciation_amount", accumulated_depreciation);
})
}
erpnext.asset.make_purchase_invoice = function(frm) {
frappe.call({
args: {
"asset": frm.doc.name,
"item_code": frm.doc.item_code,
"gross_purchase_amount": frm.doc.gross_purchase_amount,
"company": frm.doc.company,
"posting_date": frm.doc.purchase_date
},
method: "erpnext.accounts.doctype.asset.asset.make_purchase_invoice",
callback: function(r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
})
}
erpnext.asset.make_sales_invoice = function(frm) {
frappe.call({
args: {
"asset": frm.doc.name,
"item_code": frm.doc.item_code,
"company": frm.doc.company
},
method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
callback: function(r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
})
}
erpnext.asset.scrap_asset = function(frm) {
frappe.confirm(__("Do you really want to scrap this asset?"), function () {
frappe.call({
args: {
"asset_name": frm.doc.name
},
method: "erpnext.accounts.doctype.asset.depreciation.scrap_asset",
callback: function(r) {
cur_frm.reload_doc();
}
})
})
}
erpnext.asset.restore_asset = function(frm) {
frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
frappe.call({
args: {
"asset_name": frm.doc.name
},
method: "erpnext.accounts.doctype.asset.depreciation.restore_asset",
callback: function(r) {
cur_frm.reload_doc();
}
})
})
}
erpnext.asset.transfer_asset = function(frm) {
var dialog = new frappe.ui.Dialog({
title: __("Transfer Asset"),
fields: [
{
"label": __("Target Warehouse"),
"fieldname": "target_warehouse",
"fieldtype": "Link",
"options": "Warehouse",
"get_query": function () {
return {
filters: [
["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
["Warehouse", "is_group", "=", 0]
]
}
},
"reqd": 1
},
{
"label": __("Date"),
"fieldname": "transfer_date",
"fieldtype": "Datetime",
"reqd": 1,
"default": frappe.datetime.now_datetime()
}
]
});
dialog.set_primary_action(__("Transfer"), function() {
var args = dialog.get_values();
if(!args) return;
dialog.hide();
return frappe.call({
type: "GET",
method: "erpnext.accounts.doctype.asset.asset.transfer_asset",
args: {
args: {
"asset": frm.doc.name,
"transaction_date": args.transfer_date,
"source_warehouse": frm.doc.warehouse,
"target_warehouse": args.target_warehouse,
"company": frm.doc.company
}
},
freeze: true,
callback: function(r) {
cur_frm.reload_doc();
}
})
});
dialog.show();
}

View File

@@ -1,922 +0,0 @@
{
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:asset_name",
"beta": 0,
"creation": "2016-03-01 17:01:27.920130",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "asset_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Asset Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "item_code",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
"options": "Item",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "item_name",
"fieldtype": "Read Only",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
"options": "item_code.item_name",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "asset_category",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 1,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Asset Category",
"length": 0,
"no_copy": 0,
"options": "Asset Category",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "Draft",
"fieldname": "status",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
"options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 1,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "warehouse",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
"options": "Warehouse",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "is_existing_asset",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Is Existing Asset",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "purchase_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Purchase Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "supplier",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
"options": "Supplier",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "purchase_invoice",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Purchase Invoice",
"length": 0,
"no_copy": 1,
"options": "Purchase Invoice",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "disposal_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Disposal Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "journal_entry_for_scrap",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Journal Entry for Scrap",
"length": 0,
"no_copy": 1,
"options": "Journal Entry",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "gross_purchase_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Gross Purchase Amount",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "",
"fieldname": "expected_value_after_useful_life",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Expected Value After Useful Life",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "is_existing_asset",
"fieldname": "opening_accumulated_depreciation",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Opening Accumulated Depreciation",
"length": 0,
"no_copy": 1,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "value_after_depreciation",
"fieldtype": "Currency",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Value After Depreciation",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_11",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "",
"depends_on": "",
"fieldname": "depreciation_method",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Depreciation Method",
"length": 0,
"no_copy": 0,
"options": "\nStraight Line\nDouble Declining Balance\nManual",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "total_number_of_depreciations",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Total Number of Depreciations",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)",
"fieldname": "number_of_depreciations_booked",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Number of Depreciations Booked",
"length": 0,
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "frequency_of_depreciation",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Frequency of Depreciation (Months)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "",
"fieldname": "next_depreciation_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Next Depreciation Date",
"length": 0,
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "section_break_14",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Depreciation Schedule",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "schedules",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Depreciation Schedules",
"length": 0,
"no_copy": 1,
"options": "Depreciation Schedule",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
"options": "Asset",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 72,
"image_field": "image",
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 16:26:19.111939",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
}
],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 1,
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
}

View File

@@ -1,259 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import flt, add_months, cint, nowdate, getdate
from frappe.model.document import Document
from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
from erpnext.accounts.doctype.asset.depreciation \
import get_disposal_account_and_cost_center, get_depreciation_accounts
class Asset(Document):
def validate(self):
self.status = self.get_status()
self.validate_item()
self.set_missing_values()
self.validate_asset_values()
self.make_depreciation_schedule()
self.set_accumulated_depreciation()
if self.get("schedules"):
self.validate_expected_value_after_useful_life()
# Validate depreciation related accounts
get_depreciation_accounts(self)
def on_submit(self):
self.set_status()
def on_cancel(self):
self.validate_cancellation()
self.delete_depreciation_entries()
self.set_status()
def validate_item(self):
item = frappe.db.get_value("Item", self.item_code,
["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
if not item:
frappe.throw(_("Item {0} does not exist").format(self.item_code))
elif item.disabled:
frappe.throw(_("Item {0} has been disabled").format(self.item_code))
elif not item.is_fixed_asset:
frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
elif item.is_stock_item:
frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
def set_missing_values(self):
if self.item_code:
item_details = get_item_details(self.item_code)
for field, value in item_details.items():
if not self.get(field):
self.set(field, value)
self.value_after_depreciation = (flt(self.gross_purchase_amount) -
flt(self.opening_accumulated_depreciation))
def validate_asset_values(self):
if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
if not flt(self.gross_purchase_amount):
frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
if not self.is_existing_asset:
self.opening_accumulated_depreciation = 0
self.number_of_depreciations_booked = 0
if not self.next_depreciation_date:
frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
else:
depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
if flt(self.opening_accumulated_depreciation) > depreciable_amount:
frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
.format(depreciable_amount))
if self.opening_accumulated_depreciation:
if not self.number_of_depreciations_booked:
frappe.throw(_("Please set Number of Depreciations Booked"))
else:
self.number_of_depreciations_booked = 0
if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
and not self.next_depreciation_date):
frappe.throw(_("Please set Next Depreciation Date"))
def make_depreciation_schedule(self):
if self.depreciation_method != 'Manual':
self.schedules = []
if not self.get("schedules") and self.next_depreciation_date:
value_after_depreciation = flt(self.value_after_depreciation)
number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
cint(self.number_of_depreciations_booked)
if number_of_pending_depreciations:
for n in xrange(number_of_pending_depreciations):
schedule_date = add_months(self.next_depreciation_date,
n * cint(self.frequency_of_depreciation))
depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
value_after_depreciation -= flt(depreciation_amount)
self.append("schedules", {
"schedule_date": schedule_date,
"depreciation_amount": depreciation_amount
})
def set_accumulated_depreciation(self):
accumulated_depreciation = flt(self.opening_accumulated_depreciation)
value_after_depreciation = flt(self.value_after_depreciation)
for i, d in enumerate(self.get("schedules")):
depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
value_after_depreciation -= flt(depreciation_amount)
if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
depreciation_amount += flt(value_after_depreciation - flt(self.expected_value_after_useful_life),
d.precision("depreciation_amount"))
d.depreciation_amount = depreciation_amount
accumulated_depreciation += d.depreciation_amount
d.accumulated_depreciation_amount = flt(accumulated_depreciation, d.precision("accumulated_depreciation_amount"))
def get_depreciation_amount(self, depreciable_value):
if self.depreciation_method in ("Straight Line", "Manual"):
depreciation_amount = (flt(self.value_after_depreciation) -
flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
cint(self.number_of_depreciations_booked))
else:
factor = 200.0 / self.total_number_of_depreciations
depreciation_amount = flt(depreciable_value * factor / 100, 0)
value_after_depreciation = flt(depreciable_value) - depreciation_amount
if value_after_depreciation < flt(self.expected_value_after_useful_life):
depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
return depreciation_amount
def validate_expected_value_after_useful_life(self):
accumulated_depreciation_after_full_schedule = \
max([d.accumulated_depreciation_amount for d in self.get("schedules")])
asset_value_after_full_schedule = (flt(self.gross_purchase_amount) -
flt(accumulated_depreciation_after_full_schedule))
if self.expected_value_after_useful_life < asset_value_after_full_schedule:
frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
.format(asset_value_after_full_schedule))
def validate_cancellation(self):
if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
frappe.throw(_("Asset cannot be cancelled, as it is already {0}").format(self.status))
if self.purchase_invoice:
frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
def delete_depreciation_entries(self):
for d in self.get("schedules"):
if d.journal_entry:
frappe.get_doc("Journal Entry", d.journal_entry).cancel()
d.db_set("journal_entry", None)
self.db_set("value_after_depreciation",
(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
def set_status(self, status=None):
'''Get and update status'''
if not status:
status = self.get_status()
self.db_set("status", status)
def get_status(self):
'''Returns status based on whether it is draft, submitted, scrapped or depreciated'''
if self.docstatus == 0:
status = "Draft"
elif self.docstatus == 1:
status = "Submitted"
if self.journal_entry_for_scrap:
status = "Scrapped"
elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
status = "Fully Depreciated"
elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
status = 'Partially Depreciated'
elif self.docstatus == 2:
status = "Cancelled"
return status
@frappe.whitelist()
def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
pi = frappe.new_doc("Purchase Invoice")
pi.company = company
pi.currency = frappe.db.get_value("Company", company, "default_currency")
pi.set_posting_time = 1
pi.posting_date = posting_date
pi.append("items", {
"item_code": item_code,
"is_fixed_asset": 1,
"asset": asset,
"expense_account": get_fixed_asset_account(asset),
"qty": 1,
"price_list_rate": gross_purchase_amount,
"rate": gross_purchase_amount
})
pi.set_missing_values()
return pi
@frappe.whitelist()
def make_sales_invoice(asset, item_code, company):
si = frappe.new_doc("Sales Invoice")
si.company = company
si.currency = frappe.db.get_value("Company", company, "default_currency")
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
si.append("items", {
"item_code": item_code,
"is_fixed_asset": 1,
"asset": asset,
"income_account": disposal_account,
"cost_center": depreciation_cost_center,
"qty": 1
})
si.set_missing_values()
return si
@frappe.whitelist()
def transfer_asset(args):
import json
args = json.loads(args)
movement_entry = frappe.new_doc("Asset Movement")
movement_entry.update(args)
movement_entry.insert()
movement_entry.submit()
frappe.db.commit()
frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
@frappe.whitelist()
def get_item_details(item_code):
asset_category = frappe.db.get_value("Item", item_code, "asset_category")
if not asset_category:
frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
ret = frappe.db.get_value("Asset Category", asset_category,
["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
ret.update({
"asset_category": asset_category
})
return ret

View File

@@ -1,3 +0,0 @@
frappe.listview_settings['Asset'] = {
add_fields: ['image']
}

View File

@@ -1,188 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import flt, today, getdate
def post_depreciation_entries(date=None):
# Return if automatic booking of asset depreciation is disabled
if not frappe.db.get_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically"):
return
if not date:
date = today()
for asset in get_depreciable_assets(date):
make_depreciation_entry(asset, date)
frappe.db.commit()
def get_depreciable_assets(date):
return frappe.db.sql_list("""select a.name
from tabAsset a, `tabDepreciation Schedule` ds
where a.name = ds.parent and a.docstatus=1 and ds.schedule_date<=%s
and a.status in ('Submitted', 'Partially Depreciated')
and ifnull(ds.journal_entry, '')=''""", date)
@frappe.whitelist()
def make_depreciation_entry(asset_name, date=None):
frappe.has_permission('Journal Entry', throw=True)
if not date:
date = today()
asset = frappe.get_doc("Asset", asset_name)
fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account = \
get_depreciation_accounts(asset)
depreciation_cost_center = frappe.db.get_value("Company", asset.company, "depreciation_cost_center")
for d in asset.get("schedules"):
if not d.journal_entry and getdate(d.schedule_date) <= getdate(date):
je = frappe.new_doc("Journal Entry")
je.voucher_type = "Depreciation Entry"
je.posting_date = d.schedule_date
je.company = asset.company
je.remark = "Depreciation Entry against {0} worth {1}".format(asset_name, d.depreciation_amount)
je.append("accounts", {
"account": accumulated_depreciation_account,
"credit_in_account_currency": d.depreciation_amount,
"reference_type": "Asset",
"reference_name": asset.name
})
je.append("accounts", {
"account": depreciation_expense_account,
"debit_in_account_currency": d.depreciation_amount,
"reference_type": "Asset",
"reference_name": asset.name,
"cost_center": depreciation_cost_center
})
je.flags.ignore_permissions = True
je.submit()
d.db_set("journal_entry", je.name)
asset.value_after_depreciation -= d.depreciation_amount
asset.db_set("value_after_depreciation", asset.value_after_depreciation)
asset.set_status()
return asset
def get_depreciation_accounts(asset):
fixed_asset_account = accumulated_depreciation_account = depreciation_expense_account = None
accounts = frappe.db.get_value("Asset Category Account",
filters={'parent': asset.asset_category, 'company_name': asset.company},
fieldname = ['fixed_asset_account', 'accumulated_depreciation_account',
'depreciation_expense_account'], as_dict=1)
if accounts:
fixed_asset_account = accounts.fixed_asset_account
accumulated_depreciation_account = accounts.accumulated_depreciation_account
depreciation_expense_account = accounts.depreciation_expense_account
if not accumulated_depreciation_account or not depreciation_expense_account:
accounts = frappe.db.get_value("Company", asset.company,
["accumulated_depreciation_account", "depreciation_expense_account"])
if not accumulated_depreciation_account:
accumulated_depreciation_account = accounts[0]
if not depreciation_expense_account:
depreciation_expense_account = accounts[1]
if not fixed_asset_account or not accumulated_depreciation_account or not depreciation_expense_account:
frappe.throw(_("Please set Depreciation related Accounts in Asset Category {0} or Company {1}")
.format(asset.asset_category, asset.company))
return fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account
@frappe.whitelist()
def scrap_asset(asset_name):
asset = frappe.get_doc("Asset", asset_name)
if asset.docstatus != 1:
frappe.throw(_("Asset {0} must be submitted").format(asset.name))
elif asset.status in ("Cancelled", "Sold", "Scrapped"):
frappe.throw(_("Asset {0} cannot be scrapped, as it is already {1}").format(asset.name, asset.status))
je = frappe.new_doc("Journal Entry")
je.voucher_type = "Journal Entry"
je.posting_date = today()
je.company = asset.company
je.remark = "Scrap Entry for asset {0}".format(asset_name)
for entry in get_gl_entries_on_asset_disposal(asset):
entry.update({
"reference_type": "Asset",
"reference_name": asset_name
})
je.append("accounts", entry)
je.flags.ignore_permissions = True
je.submit()
frappe.db.set_value("Asset", asset_name, "disposal_date", today())
frappe.db.set_value("Asset", asset_name, "journal_entry_for_scrap", je.name)
asset.set_status("Scrapped")
frappe.msgprint(_("Asset scrapped via Journal Entry {0}").format(je.name))
@frappe.whitelist()
def restore_asset(asset_name):
asset = frappe.get_doc("Asset", asset_name)
je = asset.journal_entry_for_scrap
asset.db_set("disposal_date", None)
asset.db_set("journal_entry_for_scrap", None)
frappe.get_doc("Journal Entry", je).cancel()
asset.set_status()
@frappe.whitelist()
def get_gl_entries_on_asset_disposal(asset, selling_amount=0):
fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(asset.value_after_depreciation)
gl_entries = [
{
"account": fixed_asset_account,
"credit_in_account_currency": asset.gross_purchase_amount,
"credit": asset.gross_purchase_amount
},
{
"account": accumulated_depr_account,
"debit_in_account_currency": accumulated_depr_amount,
"debit": accumulated_depr_amount
}
]
profit_amount = flt(selling_amount) - flt(asset.value_after_depreciation)
if flt(asset.value_after_depreciation) and profit_amount:
debit_or_credit = "debit" if profit_amount < 0 else "credit"
gl_entries.append({
"account": disposal_account,
"cost_center": depreciation_cost_center,
debit_or_credit: abs(profit_amount),
debit_or_credit + "_in_account_currency": abs(profit_amount)
})
return gl_entries
@frappe.whitelist()
def get_disposal_account_and_cost_center(company):
disposal_account, depreciation_cost_center = frappe.db.get_value("Company", company,
["disposal_account", "depreciation_cost_center"])
if not disposal_account:
frappe.throw(_("Please set 'Gain/Loss Account on Asset Disposal' in Company {0}").format(company))
if not depreciation_cost_center:
frappe.throw(_("Please set 'Asset Depreciation Cost Center' in Company {0}").format(company))
return disposal_account, depreciation_cost_center

View File

@@ -1,337 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import frappe
import unittest
from frappe.utils import cstr, nowdate, getdate, flt
from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
from erpnext.accounts.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
class TestAsset(unittest.TestCase):
def setUp(self):
set_depreciation_settings_in_company()
create_asset()
def test_purchase_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
asset.company, asset.purchase_date)
pi.supplier = "_Test Supplier"
pi.insert()
pi.submit()
asset.load_from_db()
self.assertEqual(asset.supplier, "_Test Supplier")
self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
self.assertEqual(asset.purchase_invoice, pi.name)
expected_gle = (
("_Test Fixed Asset - _TC", 100000.0, 0.0),
("Creditors - _TC", 0.0, 100000.0)
)
gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
where voucher_type='Purchase Invoice' and voucher_no = %s
order by account""", pi.name)
self.assertEqual(gle, expected_gle)
pi.cancel()
asset.load_from_db()
self.assertEqual(asset.supplier, None)
self.assertEqual(asset.purchase_invoice, None)
self.assertFalse(frappe.db.get_value("GL Entry",
{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
def test_schedule_for_straight_line_method(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
self.assertEqual(asset.status, "Draft")
expected_schedules = [
["2020-12-31", 30000, 30000],
["2021-03-31", 30000, 60000],
["2021-06-30", 30000, 90000]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_straight_line_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.is_existing_asset = 1
asset.number_of_depreciations_booked = 1
asset.opening_accumulated_depreciation = 40000
asset.save()
self.assertEqual(asset.status, "Draft")
expected_schedules = [
["2020-12-31", 25000, 65000],
["2021-03-31", 25000, 90000]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_double_declining_method(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Double Declining Balance"
asset.save()
expected_schedules = [
["2020-12-31", 66667, 66667],
["2021-03-31", 22222, 88889],
["2021-06-30", 1111, 90000]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_double_declining_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Double Declining Balance"
asset.is_existing_asset = 1
asset.number_of_depreciations_booked = 1
asset.opening_accumulated_depreciation = 50000
asset.save()
expected_schedules = [
["2020-12-31", 33333, 83333],
["2021-03-31", 6667, 90000]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_manual_method(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Manual"
asset.schedules = []
for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
asset.append("schedules", {
"schedule_date": schedule_date,
"depreciation_amount": amount
})
asset.save()
self.assertEqual(asset.status, "Draft")
expected_schedules = [
["2020-12-31", 40000, 40000],
["2021-06-30", 30000, 70000],
["2021-10-31", 20000, 90000]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
def test_depreciation(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
asset.load_from_db()
self.assertEqual(asset.status, "Submitted")
post_depreciation_entries(date="2021-01-01")
asset.load_from_db()
self.assertEqual(asset.status, "Partially Depreciated")
expected_gle = (
("_Test Accumulated Depreciations - _TC", 0.0, 30000.0),
("_Test Depreciations - _TC", 30000.0, 0.0)
)
gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
where against_voucher_type='Asset' and against_voucher = %s
order by account""", asset.name)
self.assertEqual(gle, expected_gle)
self.assertEqual(asset.get("value_after_depreciation"), 70000)
def test_depreciation_entry_cancellation(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
post_depreciation_entries(date="2021-01-01")
asset.load_from_db()
# cancel depreciation entry
depr_entry = asset.get("schedules")[0].journal_entry
self.assertTrue(depr_entry)
frappe.get_doc("Journal Entry", depr_entry).cancel()
asset.load_from_db()
depr_entry = asset.get("schedules")[0].journal_entry
self.assertFalse(depr_entry)
def test_scrap_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
post_depreciation_entries(date="2021-01-01")
scrap_asset("Macbook Pro 1")
asset.load_from_db()
self.assertEqual(asset.status, "Scrapped")
self.assertTrue(asset.journal_entry_for_scrap)
expected_gle = (
("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
("_Test Fixed Asset - _TC", 0.0, 100000.0),
("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0)
)
gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
where voucher_type='Journal Entry' and voucher_no = %s
order by account""", asset.journal_entry_for_scrap)
self.assertEqual(gle, expected_gle)
restore_asset("Macbook Pro 1")
asset.load_from_db()
self.assertFalse(asset.journal_entry_for_scrap)
self.assertEqual(asset.status, "Partially Depreciated")
def test_asset_sale(self):
frappe.get_doc("Asset", "Macbook Pro 1").submit()
post_depreciation_entries(date="2021-01-01")
si = make_sales_invoice(asset="Macbook Pro 1", item_code="Macbook Pro", company="_Test Company")
si.customer = "_Test Customer"
si.due_date = nowdate()
si.get("items")[0].rate = 25000
si.insert()
si.submit()
self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Sold")
expected_gle = (
("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
("_Test Fixed Asset - _TC", 0.0, 100000.0),
("_Test Gain/Loss on Asset Disposal - _TC", 45000.0, 0.0),
("Debtors - _TC", 25000.0, 0.0)
)
gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
where voucher_type='Sales Invoice' and voucher_no = %s
order by account""", si.name)
self.assertEqual(gle, expected_gle)
si.cancel()
self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
def test_asset_expected_value_after_useful_life(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Straight Line"
asset.is_existing_asset = 1
asset.total_number_of_depreciations = 400
asset.gross_purchase_amount = 16866177.00
asset.expected_value_after_useful_life = 500000
asset.save()
accumulated_depreciation_after_full_schedule = \
max([d.accumulated_depreciation_amount for d in asset.get("schedules")])
asset_value_after_full_schedule = (flt(asset.gross_purchase_amount) -
flt(accumulated_depreciation_after_full_schedule))
self.assertTrue(asset.expected_value_after_useful_life >= asset_value_after_full_schedule)
def tearDown(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
asset.cancel()
self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Cancelled")
frappe.delete_doc("Asset", "Macbook Pro 1")
def create_asset():
if not frappe.db.exists("Asset Category", "Computers"):
create_asset_category()
if not frappe.db.exists("Item", "Macbook Pro"):
create_fixed_asset_item()
asset = frappe.get_doc({
"doctype": "Asset",
"asset_name": "Macbook Pro 1",
"asset_category": "Computers",
"item_code": "Macbook Pro",
"company": "_Test Company",
"purchase_date": "2015-01-01",
"next_depreciation_date": "2020-12-31",
"gross_purchase_amount": 100000,
"expected_value_after_useful_life": 10000,
"warehouse": "_Test Warehouse - _TC"
})
try:
asset.save()
except frappe.DuplicateEntryError:
pass
return asset
def create_asset_category():
asset_category = frappe.new_doc("Asset Category")
asset_category.asset_category_name = "Computers"
asset_category.total_number_of_depreciations = 3
asset_category.frequency_of_depreciation = 3
asset_category.append("accounts", {
"company_name": "_Test Company",
"fixed_asset_account": "_Test Fixed Asset - _TC",
"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
"depreciation_expense_account": "_Test Depreciations - _TC"
})
asset_category.insert()
def create_fixed_asset_item():
try:
frappe.get_doc({
"doctype": "Item",
"item_code": "Macbook Pro",
"item_name": "Macbook Pro",
"description": "Macbook Pro Retina Display",
"asset_category": "Computers",
"item_group": "All Item Groups",
"stock_uom": "Nos",
"is_stock_item": 0,
"is_fixed_asset": 1
}).insert()
except frappe.DuplicateEntryError:
pass
def set_depreciation_settings_in_company():
company = frappe.get_doc("Company", "_Test Company")
company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
company.depreciation_expense_account = "_Test Depreciations - _TC"
company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
company.depreciation_cost_center = "_Test Cost Center - _TC"
company.save()
# Enable booking asset depreciation entry automatically
frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)

View File

@@ -1,287 +0,0 @@
{
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:asset_category_name",
"beta": 0,
"creation": "2016-03-01 17:41:39.778765",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
"engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "asset_category_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Asset Category Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "Straight Line",
"fieldname": "depreciation_method",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Depreciation Method",
"length": 0,
"no_copy": 0,
"options": "\nStraight Line\nDouble Declining Balance",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "total_number_of_depreciations",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Total Number of Depreciations",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "frequency_of_depreciation",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Frequency of Depreciation (Months)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "section_break_2",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
"options": "Asset Category Account",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 16:09:52.955332",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset Category",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
}

View File

@@ -1,15 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cint
from frappe.model.document import Document
class AssetCategory(Document):
def validate(self):
for field in ("total_number_of_depreciations", "frequency_of_depreciation"):
if cint(self.get(field))<1:
frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)

View File

@@ -1,149 +0,0 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2016-03-07 15:55:18.806409",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 3,
"fieldname": "company_name",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 1,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 3,
"fieldname": "fixed_asset_account",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Fixed Asset Account",
"length": 0,
"no_copy": 0,
"options": "Account",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2,
"fieldname": "accumulated_depreciation_account",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Accumulated Depreciation Account",
"length": 0,
"no_copy": 0,
"options": "Account",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2,
"fieldname": "depreciation_expense_account",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Depreciation Expense Account",
"length": 0,
"no_copy": 0,
"options": "Account",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2016-11-03 15:12:55.775239",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset Category Account",
"name_case": "",
"owner": "Administrator",
"permissions": [],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_seen": 0
}

View File

@@ -1,18 +0,0 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Asset Movement', {
onload: function(frm) {
frm.add_fetch("asset", "warehouse", "source_warehouse");
frm.set_query("target_warehouse", function() {
return {
filters: [
["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
["Warehouse", "is_group", "=", 0]
]
}
})
}
});

View File

@@ -1,307 +0,0 @@
{
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,
"autoname": "AM-.#####",
"beta": 0,
"creation": "2016-04-25 18:00:23.559973",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "asset",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 1,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Asset",
"length": 0,
"no_copy": 0,
"options": "Asset",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "transaction_date",
"fieldtype": "Datetime",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
"options": "Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 1,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "source_warehouse",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Source Warehouse",
"length": 0,
"no_copy": 0,
"options": "Warehouse",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "target_warehouse",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 1,
"label": "Target Warehouse",
"length": 0,
"no_copy": 0,
"options": "Warehouse",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
"options": "Asset Movement",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 16:09:32.069344",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset Movement",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
},
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
},
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Stock Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
}

Some files were not shown because too many files have changed in this diff Show More