Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev
2020-04-15 23:48:27 +05:30
Saqib Ansari
f53299e98a
fix: warehouse unset when cannot find item warehouse
...
* cannot set delivery date when all items gets deleted and new are added
2020-04-15 22:10:48 +05:30
Saqib Ansari
34640777cd
fix: pos not accessible without default customer
2020-04-15 22:10:43 +05:30
marination
0b98a6296b
fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from
2020-04-15 21:19:04 +05:30
rohitwaghchaure
1c5b12e7d4
Merge pull request #21280 from anupamvs/opportunity-calendar
...
Adding Opportunity Calendar View
2020-04-15 19:29:49 +05:30
Anupam K
9ee8110411
Adding Calendar view for Opportunity
2020-04-15 18:37:35 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer
...
feat: Provision to set Default Item Manufacturer
2020-04-15 16:35:08 +05:30
Anupam K
c4c44a9a2b
Initial JS setup
2020-04-15 12:58:24 +05:30
Saqib Ansari
55410e03e4
fix: tests depending on global default company
2020-04-15 12:57:55 +05:30
marination
8890b6044d
fix: Patch fix, Travis fix and cleanup
...
- Added UOM column in Report
- Removed mandatory on `valid_till`
- Added list view indicator for Expired status in Supplier Quotation
- Sorted Labels in Chart and syntax cleanup
- Made labels Translatable
- Fixed patch
2020-04-15 12:31:12 +05:30
marination
1bab1539b1
Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report
2020-04-15 12:16:31 +05:30
sahil28297
dd719ea151
Merge branch 'develop' into patch-fix
2020-04-15 11:58:02 +05:30
Rucha Mahabal
11121f4905
fix: patch for Healthcare Refactoring
2020-04-15 11:53:39 +05:30
Deepesh Garg
9e9d44d139
fix: Loan topup test
2020-04-15 11:20:24 +05:30
marination
8179804405
refactor: Quoted Item Comparison Report
...
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
2020-04-14 23:05:11 +05:30
Saqib Ansari
1f20c99ecf
fix: tests depending on global default company
2020-04-14 19:40:25 +05:30
Rohit Waghchaure
d0f6f1808b
fix: minor issues
2020-04-14 17:26:58 +05:30
vishdha
5008be1db5
fix: message bold
2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05
fix: Chart of account importer UX improved
2020-04-14 17:17:26 +05:30
Rohan Bansal
a1b747c3f3
fix: show stock UOM in POS
2020-04-14 14:28:56 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts
2020-04-14 14:05:32 +05:30
Saqib Ansari
aa196c0a66
fix: travis
2020-04-14 14:03:02 +05:30
Himanshu
b84333f26e
fix: move to hooks ( #21205 )
2020-04-14 13:02:03 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed ( #21251 )
2020-04-14 12:53:54 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn
...
fix: show positive taxes in credit notes
2020-04-14 12:41:25 +05:30
Shivam Mishra
8e91553d4b
Merge branch 'develop' of https://github.com/frappe/erpnext into razorpay-subscription
2020-04-14 12:00:38 +05:30
Shivam Mishra
4fdb4aa1d0
feat: use int for billing frequency
2020-04-14 12:00:15 +05:30
Shivam Mishra
cb354685d5
fix: linting issues
2020-04-14 12:00:02 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer ( #21247 )
2020-04-14 11:53:09 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions ( #21237 )
...
Frontport of #18968
2020-04-14 11:51:48 +05:30
Marica
02c9332695
fix: Project Update Email Error ( #21208 )
...
* fix: Project Update Email Error
* Update project.json
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-04-14 11:47:58 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable ( #21227 )
2020-04-14 11:42:52 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry ( #21257 )
2020-04-14 09:34:39 +05:30
Deepesh Garg
78c0841d64
Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix
...
chore: force reload doctype before running patch
2020-04-13 18:59:31 +05:30
Rucha Mahabal
79bc819f92
fix: Healthcare Patch
2020-04-13 18:51:04 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Saqib Ansari
10a6a2d77f
fix: show positive taxes in credit notes
2020-04-13 16:40:13 +05:30
Deepesh Garg
435c22e403
Merge pull request #21244 from deepeshgarg007/employee_loan_fixes
...
fix: Employee loan fixes in new loan management module
2020-04-13 16:32:42 +05:30
Deepesh Garg
40dcfd148b
fix: Import Error
2020-04-13 16:29:58 +05:30
Chinmay D. Pai
de8554d0dc
chore: force reload doctype before running patch
...
fixes Unknown column 'against_blanket_order' in 'field list'
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-13 16:03:22 +05:30
Shivam Mishra
d9ce5843e5
chore: resolve conflicts
2020-04-13 13:43:04 +05:30
Shivam Mishra
affa2fba6b
feat: updated non-profit.json
2020-04-13 13:42:01 +05:30
Marica
3ce23858bf
Merge branch 'develop' into batch_message_v13
2020-04-13 13:20:25 +05:30
Deepesh Garg
03166fab56
Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes
2020-04-13 13:20:02 +05:30
Deepesh Garg
baa7521d02
fix: Allow repayment from Salary only for term loans
2020-04-13 13:18:11 +05:30
vishdha
cfaf638cc2
fix: batch message ux improved
2020-04-13 12:31:26 +05:30
Deepesh Garg
af27d61bee
fix: Employee loan test case and other fixes
2020-04-13 12:29:00 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation
2020-04-12 13:39:43 +05:30
Deepesh Garg
0865625482
Merge pull request #21177 from nextchamp-saqib/purchase-register-filters
...
feat: (minor) purchase register filters
2020-04-11 18:12:00 +05:30
Saqib Ansari
397f894a7c
fix: cannot iterate over dict_keys
2020-04-11 18:10:59 +05:30
Syed Mujeer Hashmi
58a16f1a3b
fix: GSTR 3B Report tax amount calculation
...
The tax amount after discount amount should be considered for tax
calculation.
Fixes #21231
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-04-11 00:52:10 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status
...
fix: Added Status field in Serial No for filter and report builder
2020-04-10 20:48:06 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor
2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227
fix: SQL ssyntax error
2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters
2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
...
chore: hide redundant base received amount
2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error
2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling
2020-04-10 20:14:29 +05:30
Deepesh Garg
f7e216e285
fix: Employee loan fixes
2020-04-10 20:03:11 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17
fix: formatting
2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977
fix: travis
2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
Rucha Mahabal
120d0e5796
fix: Fee Validity test
2020-04-09 19:16:01 +05:30
Michelle Alva
7f2477b72c
fix: better error message due date
...
show better error message payment schedule due date
2020-04-09 17:23:23 +05:30
Rucha Mahabal
d30023abac
fix: failing tests
2020-04-09 16:43:13 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
...
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix
2020-04-09 12:54:33 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. ( #21206 )
2020-04-09 12:01:10 +05:30
vishdha
0b34b90e71
fix: item_name added for message
2020-04-09 11:46:46 +05:30
marination
86e8b2a1c6
fix: Status field in Serial No for filter and report builder
2020-04-08 15:38:28 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields ( #21199 )
2020-04-08 12:59:15 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace ( #21196 )
...
* fix(MWS): add marketplace region for uae
* fix: rename the fields for mws integrations
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:57:14 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled ( #20797 )
...
* fix: purchase return are allowed even when assets are not cancelled
* chore: test case
* fix: error message
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:11:40 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance
...
fix: Pick List Enhancements
2020-04-08 12:09:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb ( #21190 )
2020-04-08 11:49:06 +05:30
Rucha Mahabal
8844e95667
fix: pass ignore_mandatory flags
2020-04-08 10:04:10 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula ( #21165 )
2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces ( #21192 )
2020-04-08 09:32:41 +05:30
Raffael Meyer
28753268e6
fix(regional): DATEV report: description in header, quote nonnumeric values ( #21126 )
...
* fix description in header, quote nonnumeric values
* fix: truncate 'Buchungstext' to 60 chars
2020-04-08 09:26:18 +05:30
Raffael Meyer
385a92d3f2
fix(patch): set_task_status ( #21130 )
...
* fix(patch): set_task_status
* remove unnecessary loop, use tabs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 09:24:34 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order ( #21175 )
2020-04-08 09:20:17 +05:30
Nabin Hait
b95a794e51
Merge branch 'develop' into healthcare_refactor
2020-04-08 09:08:21 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates ( #19862 )
...
* feat: a central place for regional address templates
* set up address templates during install
* why don't the tests run?
* fix: remove unused variables, fix cwd
* fix: .get() dicts contents
* fix: choose the right default
* fix: fieldname is template, not html
* fix: import unittest
* fix: remove unnecessary code
* fix: ensure country exists
* fix: ensure country exists
* feat: test updating an existing template
* fix(regional): DuplicateEntryError in test_update_address_template
* refactor and set 'is_default'
* fix codacy
* fix: patch gst_fixes
* fix: patch update_address_template_for_india
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
marination
3e7a8abf29
feat: Provision to set Default Item Manufacturer
...
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-07 21:00:57 +05:30
Shivam Mishra
31051679c8
feat: remove unused fields
2020-04-07 18:43:11 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance
2020-04-07 18:04:39 +05:30
rohitwaghchaure
0672b6b2e8
Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop
...
fix: get serial nos based on posting date and time
2020-04-07 18:02:49 +05:30
Nabin Hait
c9f08bed2b
fix: set batch qty in batch master and test cases
2020-04-07 17:33:10 +05:30
Rohan Bansal
f92a5f32bd
fix: set batch ID as title instead of item code
2020-04-07 17:33:10 +05:30
Rohan Bansal
d2d73e6cb7
fix: prioritize empty over expired as batch status
2020-04-07 17:33:10 +05:30
Rohan Bansal
ba03853b2a
fix: update Batch schema
2020-04-07 17:33:10 +05:30
Rohan Bansal
ced78cf116
fix(stock): make requested changes
2020-04-07 17:33:10 +05:30
Rohan Bansal
92669eae66
fix(stock): batch list view statuses
2020-04-07 17:33:10 +05:30
Rohan Bansal
4a50c99867
fix(stock): Update batch quantity whenever stock in it is moved
2020-04-07 17:33:10 +05:30
Rohan Bansal
1bd7ea99f4
fix(batch): Only consider valid stock ledger entries
2020-04-07 17:33:10 +05:30
Rohan Bansal
40611080da
fix(patch): Fix edge cases for Batch
2020-04-07 17:33:10 +05:30
Rohan Bansal
56827a372c
fix(patch): Reload Batch doctype before update query
2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40
feat(batch): Add total quantity and dashboard to Batch
2020-04-07 17:33:10 +05:30
Saqib Ansari
e9b63e45b9
chore: hide redundant base received amount
2020-04-07 17:22:11 +05:30
Rucha Mahabal
d72d9814e2
Merge branch 'develop' into healthcare_refactor
2020-04-07 16:52:22 +05:30
Rucha Mahabal
9d0ff961bc
fix: patch and tests
2020-04-07 16:43:22 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix
...
fix: Use separate condition for tree and normal doctype
2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab
fix: Use separate condition for tree and normal doctype
2020-04-07 15:17:06 +05:30
rohitwaghchaure
d313a239de
Merge pull request #21065 from marination/bin-requested-qty
...
fix: Updated Bin Requested Qty logic
2020-04-07 14:50:19 +05:30
Shivam Mishra
65e11a9640
refactor: razorpay subscription for memberships
2020-04-07 14:49:28 +05:30
Rohit Waghchaure
560f822dbf
fix: get serial nos based on posting date and time
2020-04-07 14:42:02 +05:30
rohitwaghchaure
55ea142afd
Merge pull request #21181 from marination/purchase-receipt-scan-barcode
...
feat: Scan Barcode in Purchase Receipt
2020-04-07 14:36:56 +05:30
Marica
c732e9967d
fix: Validate Serial/Batch No naming series in Item itself ( #21167 )
...
* fix: Validate Serial/Batch No naming series in Item itself
* fix: Consider '#' too
2020-04-07 14:16:14 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance
2020-04-07 14:05:05 +05:30
marination
39f9dd03a7
fix: Use reload_doc in patch
2020-04-07 14:03:50 +05:30
Deepesh Garg
d14598bc51
Merge pull request #21180 from KanchanChauhan/address-from-lead
...
fix: (minor) Mandatory field missing to create address from lead
2020-04-07 12:22:54 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements ( #21034 )
...
* fix: nontype error for resolved and moved place order button at bottom left
* fix: removed inline style
* fix: Request for quotation move to lower right
* fix: move buttons
Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ( #21020 )
...
* feat: Date range in financial statements
* feat: Add date range filter in consolidated financial statement
* fix: Handle API changes in query_report
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:16:25 +05:30
Saqib
30fc621f1e
fix: Create Item tax template only for specific account types ( #20931 )
...
fix: Create Item tax template only for specific account types
2020-04-07 12:12:04 +05:30
Saqib
5bd54f544c
fix(shopping-cart): address is made mandatory to place order ( #20923 )
...
fix(shopping-cart): address is made mandatory to place order
2020-04-07 12:09:59 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart ( #20879 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:07:01 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop
...
fix: material request type manufacture shows items with Is Purchase I…
2020-04-07 12:06:18 +05:30
Suraj Shetty
8b55304715
Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations
2020-04-07 11:04:04 +05:30
Deepesh Garg
4461868eff
Merge pull request #21184 from hrwX/update_modified
...
fix: update modified for opportunity
2020-04-07 10:15:41 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix
...
fix: payment request status fixes
2020-04-07 10:13:08 +05:30
Himanshu Warekar
48307513c1
fix: update modified for opportunity
2020-04-07 09:06:03 +05:30
Kanchan Chauhan
4791e313db
fix: Mandatory field missing to create address from lead
2020-04-06 23:56:23 +05:30
marination
e05013ede3
feat: Scan Barcode in Purchase Receipt
2020-04-06 22:13:13 +05:30
Rucha Mahabal
0f23a304bc
fix: added patch for refactored changes
2020-04-06 19:00:17 +05:30
Saqib Ansari
ca3967d52f
feat: (minor) purchase register filters
2020-04-06 18:25:23 +05:30
Rohit Waghchaure
5317907e15
fix: material request type manufacture shows items with Is Purchase Item enabled
2020-04-06 17:53:16 +05:30
Saqib Ansari
b2a84fe478
chore: rename bank reconciliation to bank clearance
2020-04-06 16:32:33 +05:30
marination
642f19d704
fix: Patch fix
2020-04-06 16:01:50 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty
2020-04-06 15:54:51 +05:30
Shivam Mishra
8d6cded07f
feat: added subscription web hook
2020-04-06 15:01:30 +05:30
Shivam Mishra
d92b7ab258
fix: use false explicitly
2020-04-06 14:44:33 +05:30
Shivam Mishra
4b667160a0
feat: added razorpay details to membership
2020-04-06 14:44:17 +05:30
Saqib
046b69d427
Merge branch 'develop' into item_tax_template_fix
2020-04-06 14:32:45 +05:30
Saqib
0f7ef139dc
Merge branch 'develop' into cart-address-update-v13
2020-04-06 14:23:51 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements ( #20876 )
...
* feat: Add report summary API for Balance Sheet and PL report
* fix: Add summary cards in Cash flow report
* feat: Add report summary in consolidated financial statements
* fix: Remove accumulated values filter from P&L and cashflow report
* fix: set company default currency in profit and loss statement if no data
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-06 14:07:20 +05:30
Deepesh Garg
8853850fd8
Merge branch 'develop' into item_tax_template_fix
2020-04-06 13:13:37 +05:30
Deepesh Garg
c01ec7606d
fix: Currency validation for default company accounts ( #21094 )
...
* fix: Currency validation for default company accounts
* fix: Improve message
2020-04-06 12:43:07 +05:30
Saqib Ansari
474222074b
fix: tests
2020-04-06 12:40:41 +05:30
Saqib Ansari
4de2416806
fix: change request status on payment entry cancel
2020-04-06 12:34:38 +05:30
Marica
b37f0bb052
Merge pull request #20864 from deepeshgarg007/po_supplier_skip
...
feat: Allow PI creation without PO
2020-04-06 12:15:42 +05:30
Himanshu Warekar
c207c457a5
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-04-06 11:34:27 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer ( #21142 )
...
* fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer
* fix: Use cint
2020-04-06 10:23:06 +05:30
Deepesh Garg
1958749382
fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype ( #21147 )
...
* fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype
* fix: Codacy
2020-04-06 10:21:50 +05:30
rohitwaghchaure
05ac7213b3
fix: allow to make BOM against template item ( #21146 )
...
* fix: allow to make BOM against template item
* Update queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-06 10:17:57 +05:30
Nabin Hait
75ef458b34
fix: update attendace from leave application ( #21155 )
2020-04-06 10:15:38 +05:30
Deepesh Garg
0268c553a3
Merge pull request #21163 from deepeshgarg007/gst_3b_user_perm
...
fix: User permissions in GSTR 3B report
2020-04-04 21:48:23 +05:30
Deepesh Garg
6c8efdef09
fix: User permissions in GSTR 3B report
2020-04-04 20:05:17 +05:30
Saqib
63bdf5dc74
fix: [ux] credit to & debit to error message ( #21132 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 19:35:55 +05:30
Marica
f55c9c8d8c
Merge branch 'develop' into po_supplier_skip
2020-04-03 18:35:48 +05:30
marination
2a9a5352bb
fix: Test Cases and block expense on outward entry
...
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
marination
fd04e96bdd
fix: Mapping Customer Provided Material Request to Stock Entry
...
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
2020-04-03 15:46:48 +05:30
Saqib Ansari
4a85b42da0
fix: travis
2020-04-03 14:31:00 +05:30
Saqib
e2c355f670
Merge branch 'develop' into payment-req-status-fix
2020-04-03 11:29:15 +05:30
Deepesh Garg
fc0bd2a9e4
Merge pull request #21150 from scmmishra/fix-patch-dashboard
...
fix (tests): module import error for Dashboard Chart Field
2020-04-03 11:04:51 +05:30
Shivam Mishra
3251e1304c
fix: lms quiz type error ( #21152 )
2020-04-03 10:08:19 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM ( #21054 )
...
* fix: Update Received Qty in Material Request as per Stock UOM
* fix: Process each PR only once
* fix: minor suggested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 10:07:06 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them ( #21078 )
...
* fix: cannot set warehouse on deleting all so items and updating them
* fix: travis
* fix: docname is editable in update items dialog
2020-04-03 10:02:56 +05:30
Deepesh Garg
0f25a40421
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-04-02 21:30:53 +05:30
Deepesh Garg
d29dd58e89
fix: Validation
2020-04-02 21:29:59 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
Deepesh Garg
13dbc4a415
Merge branch 'develop' into fix-patch-dashboard
2020-04-02 20:24:23 +05:30
Shivam Mishra
03a1e31195
Merge branch 'develop' into fix-patch-dashboard
2020-04-02 20:00:11 +05:30
Shivam Mishra
d9a17a9be1
fix (tests): reload doctype
2020-04-02 19:57:11 +05:30
marination
9a39bcd031
fix: Fixed Test Cases for Material Request
...
- Reduce quantity on Material Transfer/Issue
- No effect on Customer Provided Material Request
2020-04-02 19:36:21 +05:30
Rucha Mahabal
ced978e192
fix: code clean up, performance improvements
2020-04-02 18:45:53 +05:30
Deepesh Garg
872fcb6cae
fix: Travis
2020-04-02 18:11:46 +05:30
marination
686a09620d
fix: Commonified code and added server side validation
2020-04-02 13:51:25 +05:30
rohitwaghchaure
e4fecd725d
Merge pull request #21144 from anupamvs/year-sum-fix
...
Sum of years not needed.
2020-04-02 12:01:17 +05:30
Anupam K
b20dbff726
Sum of years not needed.
2020-04-02 11:37:44 +05:30
Deepesh Garg
625acab057
fix: Add duplicate item validation
2020-04-02 11:18:22 +05:30
Anupam K
e48bcb30e7
Sum of years not needed.
2020-04-02 01:04:01 +05:30
Deepesh Garg
94a505d31c
Merge pull request #21135 from marination/stock-ledger-typo
...
fix: Typo in stock level validation in Stock Ledger
2020-04-01 11:20:32 +05:30
marination
6f0dc8257c
fix: Typo in stock level validation in Stock Ledger
2020-04-01 11:04:14 +05:30
Marica
7ecacb6360
Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop
2020-04-01 10:47:33 +05:30
Deepesh Garg
5dcd2c118e
Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos
...
fix: customer group price list not fetched in pos
2020-04-01 09:42:13 +05:30
Deepesh Garg
8862be769b
Merge pull request #20809 from ronelvcabrera/billing-contact
...
feat(Contacts): select billing contact for sales invoice
2020-03-31 20:42:26 +05:30
Nabin Hait
9f6bf71b95
Merge branch 'develop' into healthcare_refactor
2020-03-31 20:31:25 +05:30
Nabin Hait
a0018eed63
Merge branch 'develop' into refactor-addiional-salary
2020-03-31 20:30:52 +05:30
Saqib Ansari
9a7851096c
fix: check if selling price exists then set it
2020-03-31 18:48:35 +05:30
Saqib Ansari
8ed7535e8a
fix: travis
2020-03-31 18:44:02 +05:30
Saqib Ansari
0c8a0c9c3a
fix: no server side validations for accounts in asset category
2020-03-31 18:19:31 +05:30
Poranut Chollavorn
48aa2dd94b
fix(pos): fix pos display item instock
2020-03-31 18:13:55 +05:30
rohitwaghchaure
a19aa0431a
Merge pull request #20826 from saurabh6790/lead-address-fixes
...
fix: if mandatory fields are missing do not create address against lead
2020-03-31 17:38:06 +05:30
Deepesh Garg
cf9347d2f5
fix: Undo unneccessary changes
2020-03-31 17:28:43 +05:30
Deepesh Garg
5fd456baa4
Merge branch 'develop' into customer-group-price-list-in-pos
2020-03-31 16:33:41 +05:30
Deepesh Garg
bf884e8b37
Merge pull request #21092 from scmmishra/multiple-option-fix
...
fix: use setup from Supplier Quotation Controller
2020-03-31 16:28:47 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom
...
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-31 16:24:37 +05:30
Deepesh Garg
eeb9ba81d7
Merge branch 'develop' into project-link-for-all-accounts
2020-03-31 16:07:23 +05:30
Deepesh Garg
d45e0e0b5b
Merge branch 'develop' into billing-contact
2020-03-31 16:06:11 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation
...
feat: allow BOM to use same item as raw material (develop)
2020-03-31 16:04:26 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor
2020-03-31 15:59:22 +05:30
Saurabh
84b93414d0
fix: typo
2020-03-31 15:58:00 +05:30
Saurabh
6c8d63f3b9
fix: provision to setup new address from lead if address creation break due to mandatory exception
2020-03-31 15:58:00 +05:30
Saurabh
e567563aa1
fix: if mandatory fields are missing do not create address against lead
2020-03-31 15:58:00 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation
...
fix: allow target warehouses to be changed for work order stock entries (develop)
2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac ( #20995 )
...
* fix: warehouse_account_map not getting reset for diff company transaction
* fix: potential key errors while fetching warehouse_account_map
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-31 15:31:15 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue
...
fix: Adding proper error message
2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups ( #21070 )
2020-03-31 15:28:45 +05:30
rohitwaghchaure
d274923ae1
fix: "Qty To Manufacture" field as non mandatory in job card ( #21081 )
2020-03-31 15:28:31 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry ( #21083 )
2020-03-31 15:26:45 +05:30
Deepesh Garg
242a079bcb
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-03-31 14:18:30 +05:30
Deepesh Garg
4d9fe69ba5
fix: Test cases
2020-03-31 14:17:53 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue
2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal ( #21084 )
...
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
2020-03-31 10:51:09 +05:30
Saqib
bba78f0384
fix: auto created asset message ( #21108 )
...
* fix: auto created asset message
* Update erpnext/controllers/buying_controller.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-31 10:49:44 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher ( #21073 )
...
* fix: Expense account currency validation in Landed Cost voucher
* fix: Remove unused imports
2020-03-31 10:45:32 +05:30
Andy Zhu
5c54adec28
fix: docfield of sales_order is not fetching route options for new doc ( #21123 )
...
Using the wrong method to get `so` as docfield.
frappe.meta changes will not effect the `sales_order` in `frm`.
2020-03-31 10:43:00 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session ( #20867 )
...
Co-authored-by: prafful1234 <prafful@mntechnique.com>
2020-03-31 10:40:42 +05:30
Raffael Meyer
b0ab3981ea
fix(regional): header row in DATEV report ( #21113 )
...
* fix(regional): encoding of DATEV report
* feat(regional): filter datev report by voucher type
* fix: creation time, coa used, is frozen
* add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry
* fix indentation
* fix indentation
* fix indentation
2020-03-31 10:40:03 +05:30
Ahmad M Abdelrahman
06b3f6f781
Remove Campagin restrection ( #21024 )
...
Lead Source Now is an independent doctype.
forcing the user to add Campaign is not valid
Solution
Show Campaign keeping it optional and keep the user to be free to add or remove data
2020-03-31 10:38:49 +05:30
Deepesh Garg
cc4753977f
Merge branch 'develop' into po_supplier_skip
2020-03-31 10:37:21 +05:30
Shivam Mishra
7806e5a052
feat: changes for desk pages ( #21027 )
...
* feat: rename Chart on Getting Started Page
* feat: add dashboard and leaderboard to getting started
* feat: remove communication
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-03-31 10:30:20 +05:30
Deepesh Garg
007548b79c
fix: Bank Account patch ( #21124 )
2020-03-31 10:07:51 +05:30
Deepesh Garg
c014c802dd
fix: Remove comments
2020-03-30 22:50:29 +05:30
Deepesh Garg
c33412b6ae
feat: Link blanket order and quotation
2020-03-30 22:44:13 +05:30
Shivam Mishra
3a2c8560ba
feat: update desk page for Non Profits
2020-03-30 18:15:51 +05:30
Shivam Mishra
28fafd0dda
feat: setup subscription API
2020-03-30 18:15:37 +05:30
Shivam Mishra
1281634306
feat: client code to handle razorpay fields
2020-03-30 18:15:22 +05:30
Shivam Mishra
1d6395c5cf
feat: add PAN details field to member for India
2020-03-30 18:14:44 +05:30
Shivam Mishra
e836cdec13
feat: update member and membership doctype
2020-03-30 18:14:10 +05:30
Shivam Mishra
1f20f6348d
feat: added membership settings doctype
2020-03-30 18:13:29 +05:30
Deepesh Garg
f0760dee80
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue
2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2
fix: Test cases
2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Deepesh Garg
647529651d
Merge pull request #21067 from Alchez/dev-add-issue-status-filter
...
feat: add status filter in issue web form (develop)
2020-03-30 12:23:20 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop
...
fix: not able to add equity account in the chart of accounts
2020-03-30 12:15:01 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev
...
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-29 21:55:25 +05:30
Deepesh Garg
fe1f754d83
Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink
...
chore: hyperlinks in cannot cancel message
2020-03-29 21:53:43 +05:30
Deepesh Garg
e0a4a32460
Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix
...
fix: cannot view report for course doctype - permission problem
2020-03-29 21:51:15 +05:30
Rohit Waghchaure
cdf80eb4ad
fix: not able to add equity account in the chart of accounts
2020-03-29 16:35:10 +05:30
Saqib Ansari
0f6d372182
fix: cannot view report for course doctype - permission problem
2020-03-29 12:52:16 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix
...
fix: total currency formatting in Acc Receivable and Payable
2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed
2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message
2020-03-28 21:17:58 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter
...
chore: [ux] filter warehouse based on company
2020-03-28 21:09:46 +05:30
Saqib Ansari
b345fe0fe9
chore: hyperlinks in cannot cancel message
2020-03-28 20:11:26 +05:30
Saqib Ansari
ed3553f795
chore: [ux] filter warehouse based on company
2020-03-28 19:12:59 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix
...
fix: currency formatting in gl entry dr cr field
2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1
fix: currency formatting in gl entry dr cr field
2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6
fix: payment request status fixes
2020-03-28 16:11:23 +05:30
rohitwaghchaure
2d5addafa7
Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug
...
bug: Item-wise Sales History - Billed amount
2020-03-28 15:05:41 +05:30
Rohit Waghchaure
e7c4565483
fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings
2020-03-28 14:59:00 +05:30
Anupam K
85aae7de0b
bug: Item-wise Sales History - Billed amount
2020-03-28 14:13:58 +05:30
Saqib Ansari
8488ef8eb1
fix: customer group price list not fetched in pos
2020-03-28 14:07:09 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev
2020-03-27 21:51:00 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix
2020-03-27 21:39:16 +05:30
Shivam Mishra
71fb8e8b57
fix: use setup from Supplier Quotation Controller
2020-03-27 20:47:04 +05:30
Nabin Hait
fe000e20e8
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-27 19:24:47 +05:30
Shivam Mishra
cf6a814328
fix: total currency formatting
2020-03-27 19:15:59 +05:30
Deepesh Garg
c5f40d9072
Merge branch 'develop' into sahil28297-patch-1
2020-03-27 18:43:13 +05:30
rohitwaghchaure
0fc8b2af60
Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop
...
fix: item not showing in popup while making batch
2020-03-27 13:49:23 +05:30
Rohit Waghchaure
a5357c2e27
fix: item not showing in popup while making batch
2020-03-27 12:59:02 +05:30
Deepesh Garg
3a639ea187
Merge branch 'develop' into demo-fixed-asset-fix
2020-03-27 11:31:53 +05:30
Rucha Mahabal
cdf7189c29
fix: remove Expired status from Appointment
2020-03-27 11:30:00 +05:30
Deepesh Garg
88898abe6c
fix: Randomly failing loan repayment test
2020-03-27 10:27:15 +05:30
Rucha Mahabal
197165ff40
fix: codacy
2020-03-26 17:29:50 +05:30
Rohan Bansal
da54719b43
feat: add status filter in issue web form
2020-03-26 16:08:03 +05:30
Rucha Mahabal
42376705ab
fix: don't append year if values have same year in Appointment Analytics
2020-03-26 16:02:53 +05:30
Anupam K
7ca28fdab5
fix: Adding proper error message
2020-03-26 15:54:15 +05:30
marination
815c36a4eb
fix: Updated Bin Requested Qty logic
2020-03-26 15:46:27 +05:30
Rohan
ea182051d3
fix: consumed qty values in work order
2020-03-26 15:32:01 +05:30
Rucha Mahabal
2cec6bd789
fix: check new patient before creating fee validity
2020-03-26 14:38:12 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger ( #21021 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-26 13:37:40 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date ( #21044 )
2020-03-26 13:29:02 +05:30
Raffael Meyer
89cac5af16
fix(regional): encoding of DATEV report ( #21059 )
2020-03-26 13:25:58 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable ( #20999 )
2020-03-26 13:23:49 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation ( #20996 )
2020-03-26 13:20:31 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection ( #20757 )
...
* feat: auto set batch no on serial no selection
* fix: dialog not shown if set warehouse selected
* fix: typo
* fix: merge conflict
* fix: callback no getting called after serial no selected
* fix: available batch qty not fetched without set_warehouse selected
* fix: item batch not synced with dialog batch table
2020-03-26 13:18:57 +05:30
Nabin Hait
1aa8c2ecc4
fix: delete contact email and phone along with contact
2020-03-26 13:15:31 +05:30
Nabin Hait
ced6898fd7
fix: Ignored user permission for parent_company and existing_company field in Company
2020-03-26 12:30:29 +05:30
Deepesh Garg
5fbada75fa
Merge pull request #21038 from anupamvs/error-message-changes
...
fix: add better error message
2020-03-26 11:56:34 +05:30
Deepesh Garg
9062ce5191
fix: Spacing and indentations
2020-03-26 11:56:03 +05:30
Anupam K
9725e43eed
fix: Adding proper error message
2020-03-26 00:17:09 +05:30
Deepesh Garg
bdcfab3a0f
fix: Update patch and bank form cleanup
2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79
Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop
2020-03-25 21:00:25 +05:30
Anupam K
10b7a51805
Better error message
2020-03-25 18:21:42 +05:30
Deepesh Garg
113c6c86b7
fix: Remove debug
2020-03-25 16:54:17 +05:30
Deepesh Garg
878e4fbcf8
fix: Place of supply validation in GSTR-1 report
2020-03-25 16:52:07 +05:30
Rucha Mahabal
b60979cfaa
fix: show Change Item Code button only if Unit Type is billable
2020-03-25 02:10:33 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop
...
fix: batch selection popup not coming for stock entry
2020-03-24 16:32:21 +05:30
Deepesh Garg
da6fb435dd
Merge pull request #21041 from deepeshgarg007/default_dimension_clean_up
...
fix: Default dimension set code cleanup
2020-03-24 15:47:51 +05:30
Deepesh Garg
4e3fbf5a8b
fix: Default dimension set code cleanup
2020-03-24 15:43:21 +05:30
Anupam K
b14085eb0e
Better error message
2020-03-24 12:17:28 +05:30
Rucha Mahabal
60e558a019
test: Patient Medical Record
2020-03-24 11:54:35 +05:30
Rucha Mahabal
aabcee4f8f
test: Healthcare Consultation DocTypes
2020-03-24 11:54:15 +05:30
Anupam K
95e35f9e81
Better error message
2020-03-24 11:52:34 +05:30
Rohit Waghchaure
5c1404e878
fix: batch selection popup not coming for stock entry
2020-03-24 11:40:03 +05:30
Rohan
7ea79933b3
fix: handle error handling ( #20815 )
2020-03-23 14:54:33 +05:30
Rohan
879c6bfb44
Merge branch 'develop' into dev-stock-entry-fg-validation
2020-03-23 14:50:02 +05:30
sahil28297
39f02da45a
Merge branch 'develop' into sahil28297-patch-1
2020-03-23 13:03:30 +05:30
Rucha Mahabal
f67afe67ab
test: Healthcare Masters
2020-03-23 12:31:13 +05:30
Rucha Mahabal
4f9a1471e4
fix: tests
2020-03-23 10:40:39 +05:30
Deepesh Garg
96297f73f2
Merge pull request #21025 from deepeshgarg007/dimension_perm
...
fix: Remove quick entry from accounting dimensions
2020-03-22 21:56:34 +05:30
Deepesh Garg
75225316f0
fix: Remove quick entry from accouting dimensions
2020-03-22 21:50:22 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop
...
fix: stock entry qty must be positive
2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8
fix: add warehouse check for FG item
2020-03-20 18:49:11 +05:30
Rohan
4464a591ef
fix: allow BOM to use same item as raw material
2020-03-20 18:49:08 +05:30
marination
73c8d23a79
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-20 17:52:28 +05:30
sahil28297
4c3679ba8a
fix: develop version as 12.0.0-dev
2020-03-20 15:38:52 +05:30
sahil28297
fcdc2b1815
fix: develop version as 12.0.0.dev
2020-03-20 15:20:28 +05:30
sahil28297
54cbff9e80
fix: develop version as 12.x.x instead of 12.2.0
2020-03-20 14:23:27 +05:30
Suraj Shetty
3cf0dc966c
fix: Add currency in options of Opportunity Amount
...
- To show currect symbol in list view
2020-03-20 12:51:16 +05:30
Rohit Waghchaure
5e4e2dbd03
fix: stock entry qty must be positive
2020-03-19 14:53:37 +05:30
Rohan
ce90848161
fix: allow target warehouses to be changed for work order stock entries
2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher ( #20977 )
2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop
...
fix: bom comparison issue
2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc
fix: bom comparison issue
2020-03-19 10:07:27 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop
...
fix: reserved qty for production issue for partial completion of work…
2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop
...
fix: shortage qty in stock projected qty report
2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9
fix: reserved qty for production issue for partial completion of work order
2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527
fix: shortage qty in stock projected qty report
2020-03-19 09:27:53 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed ( #20975 )
2020-03-18 18:23:38 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. ( #20969 )
2020-03-18 11:28:04 +05:30
marination
3251dcf672
fix: Added patch to patches.txt
2020-03-18 10:11:23 +05:30
Rucha Mahabal
0eeaad8ce7
fix: create fee validity for new patients only
2020-03-17 20:26:29 +05:30
Rucha Mahabal
2d785b7b09
fix: invoicing logic for appointments
2020-03-17 20:18:16 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop ( #20965 )
...
* fix: Account setting words switches to US Terminology
* created united_states.js
* Remove Unwanted Spaces
* Remove all changes
* Add spaces between arguments
Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
2020-03-17 19:39:30 +05:30
Rucha Mahabal
f2574dde37
fix: set fee validity start date and set status as Completed or Pending
2020-03-17 19:28:18 +05:30
Rucha Mahabal
2f2c09bd98
fix: wrong fee validity calculation and payment fields visibility in appointment
2020-03-17 18:10:39 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups
...
fix(accounts): adjust account groups in SKR04
2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue ( #20842 )
2020-03-17 17:01:26 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts ( #20913 )
...
* fix: Party name in Statement Of Accounts
* Update general_ledger.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 17:00:06 +05:30
marination
e1f499ae1b
fix: Pick List Enhancements
2020-03-17 11:47:11 +05:30
Deepesh Garg
e7aefc1163
fix: Add check to skip PR in supplier master
2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item ( #20796 )
...
* fix: Item alternative must have similar fields as orignal item
* fix: Using db.get_values and meta instead of get_value and get_doc
* fix: Made code more DRY
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 10:56:59 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension ( #20860 )
...
* feat: Nested set filtering for accounting dimension
* fix: Remove print statement
2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix
...
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:36:32 +05:30
Frappe PR Bot
b8b5fa6291
feat: Updated translation ( #20954 )
...
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-03-16 17:59:42 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord ( #20886 )
...
* s_inv has is_pos default set as 1
2020-03-16 17:51:00 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment ( #20949 )
2020-03-16 16:53:03 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item ( #20851 )
2020-03-16 16:29:10 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix
...
fix: Get invoice details only if invoice is selected
2020-03-16 15:56:32 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix
...
fix: use ERPNext in welcome email when default company is not set
2020-03-16 15:54:53 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges ( #20901 )
2020-03-16 15:52:25 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts ( #20940 )
...
* Add account_type and tax rate to some VAT accounts
* fix indentation
2020-03-16 15:45:05 +05:30
Himanshu Warekar
841be6713b
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-03-13 19:40:00 +05:30
Anurag Mishra
3ced42f302
feat: reverse linking and multiple additonal salaries in salary slip
2020-03-13 19:14:56 +05:30
Rucha Mahabal
cd31996b81
fix: check fee validity in a single function
2020-03-13 15:39:31 +05:30
Deepesh Garg
0b7acc0fd6
fix: Create Item tax template only for specific account types
2020-03-13 11:51:14 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website ( #20927 )
2020-03-12 18:04:42 +05:30
Rucha Mahabal
05853efeb7
feat: Healthcare Domain Workspace with chart and shortcuts
2020-03-12 17:44:46 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card
2020-03-12 17:13:03 +05:30
Saqib Ansari
af1221bcbd
chore: add tests and remove test based on allow_cost_center_for_bs_accounts
2020-03-12 17:04:17 +05:30
Shivam Mishra
f241054c6c
feat: extended settings page
2020-03-12 16:38:59 +05:30
Shivam Mishra
05d74bbcf9
feat: added loan management page
2020-03-12 16:38:49 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Myuddin khatri
b9631a501f
fix(shopping-cart): setting billing and shipping address
...
setting billing and shipping address
2020-03-12 16:21:38 +05:30
Myuddin khatri
4635ff9368
fix(shopping-cart): address is made mandatory to place order
2020-03-12 14:45:08 +05:30
Ronel Cabrera
fcb54762a1
feat(Contacts): select billing contact for sales invoice
2020-03-12 16:58:59 +08:00
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Rucha Mahabal
06d1b047e0
refactor: Healthcare Module Page
2020-03-12 12:16:23 +05:30
Chinmay D. Pai
86636212c3
fix: remove make_purchase_invoice from demo script
...
currently demo fails with the following error:
frappe@bf54a9834cfe:/workspace/development/frappe-bench$ bench --site test1.localhost execute erpnext.demo.demo.make
Traceback (most recent call last):
File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main
"__main__", mod_spec)
File "/usr/lib/python3.7/runpy.py", line 85, in _run_code
exec(code, run_globals)
File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 97, in <module>
main()
File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 18, in main
click.Group(commands=commands)(prog_name='bench')
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 764, in __call__
return self.main(*args, **kwargs)
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 717, in main
rv = self.invoke(ctx)
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 956, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 555, in invoke
return callback(*args, **kwargs)
File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/decorators.py", line 17, in new_func
return f(get_current_context(), *args, **kwargs)
File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/__init__.py", line 25, in _func
ret = f(frappe._dict(ctx.obj), *args, **kwargs)
File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/utils.py", line 145, in execute
ret = frappe.get_attr(method)(*args, **kwargs)
File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 1042, in get_attr
return getattr(get_module(modulename), methodname)
File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 823, in get_module
return importlib.import_module(modulename)
File "/workspace/development/frappe-bench/env/lib/python3.7/importlib/__init__.py", line 127, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
File "<frozen importlib._bootstrap>", line 983, in _find_and_load
File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 728, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/demo.py", line 6, in <module>
from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset
File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/user/fixed_asset.py", line 9, in <module>
from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
ImportError: cannot import name 'make_purchase_invoice' from 'erpnext.assets.doctype.asset.asset' (/workspace/development/frappe-bench/apps/erpnext/erpnext/assets/doctype/asset/asset.py)
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-11 16:20:07 +05:30
Saqib
6ec4618914
fix: travis ( #20903 )
2020-03-11 16:04:00 +05:30
Saqib Ansari
706c239cf6
fix: remove enable_allow_cost_center_in_entry_of_bs_account
2020-03-11 15:17:10 +05:30
Saqib Ansari
0a42d81993
fix: cannot find get_allow_cost_center_in_entry_of_bs_account
2020-03-11 14:27:40 +05:30
Saqib Ansari
91b307e7f8
fix: project link not set in accounts other than profilt and loss accounts
2020-03-11 13:59:15 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard ( #20847 )
2020-03-11 12:37:56 +05:30
Suraj Shetty
edc31d51da
chore: Add CSV imported translations
2020-03-10 20:51:01 +05:30
Suraj Shetty
45ce5b07b4
Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations
2020-03-10 18:22:36 +05:30
Suraj Shetty
b868c379a7
chore: Update translations
2020-03-10 18:21:33 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea
fix: Get invoice details only if invoice is selected
2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
...
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30
Rucha Mahabal
c4b2dceb01
feat: Fee Validity status (Ongoing, Expired, Completed)
2020-03-09 23:57:00 +05:30
Deepesh Garg
74d4e9e4ea
Merge pull request #20884 from deepeshgarg007/first_row_dimension
...
fix: Acccounting Dimension disappearing in first row after refresh
2020-03-09 22:47:25 +05:30
Deepesh Garg
5e58666091
fix: HSN code not visible in GST Itemised Purchase register
2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices ( #20873 )
2020-03-09 18:30:47 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation ( #20858 )
2020-03-09 18:13:41 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup ( #20853 )
2020-03-09 18:07:43 +05:30
Rucha Mahabal
27512c86ae
refactor: Healthcare utils
2020-03-09 17:29:23 +05:30
Deepesh Garg
8d72b14776
fix: Acccounting Dimension disappearing in first row after refresh
2020-03-09 08:06:07 +05:30
Raffael Meyer
f669f30c08
add missing equity accounts
2020-03-06 16:17:06 +01:00
Deepesh Garg
1943fb0de4
feat: Allow PI creation without PO
2020-03-06 18:50:11 +05:30
Raffael Meyer
7b7513ab2b
adjust groups
2020-03-06 12:32:49 +01:00
Anurag Mishra
d319feee9e
fix: reverse linking
2020-03-06 15:01:10 +05:30
Anurag Mishra
1663f66e6d
test: Recurring Additional salary
2020-03-06 15:00:41 +05:30
Anurag Mishra
885ab5dc66
fix: requested changes
2020-03-06 15:00:40 +05:30
Anurag Mishra
2d7fcab2c9
feat: Recurring Addtional Salary
2020-03-06 14:59:56 +05:30
Anurag Mishra
943457abd3
fix: reverse linking for employee advance
2020-03-06 13:37:24 +05:30
Rucha Mahabal
b754faa59c
fix: merge branch healthcare_refactor
2020-03-06 13:23:40 +05:30
Rucha Mahabal
e8bbdd5e84
fix: Lab Test Template data import failing in Lab Test Item creation
2020-03-06 13:18:56 +05:30
Rucha Mahabal
ac4199f2d7
fix (Lab Test): None TypeError in Patient Medical Record
2020-03-06 12:22:55 +05:30
Rucha Mahabal
11117810c5
fix (Vital Signs): Patient Medical Record not found
2020-03-06 12:21:18 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument ( #20838 )
2020-03-06 10:57:59 +05:30
Anurag Mishra
59a0bce3a9
feat: Repay advance from salary
2020-03-05 16:13:52 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-05 10:08:43 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options
...
feat: update profit and loss for new report summary API
2020-03-04 16:07:31 +05:30
Deepesh Garg
a75cf35bb7
Merge pull request #20755 from lokesh-indictrans/develop
...
fix: user is not able to do 'Set as Lost' for Quotation (#20603 )
2020-03-04 11:56:52 +05:30
Deepesh Garg
6d604a151b
fix: Validation message
2020-03-04 11:55:10 +05:30
Deepesh Garg
a245a3a47f
fix: HSN code no visible in GST itemised sales register
2020-03-04 10:23:49 +05:30
Lokesh Waingankar
d398c73bc5
fix: Removed html tags in pop up message ( #20603 )
2020-03-03 19:07:51 +05:30
Lokesh Waingankar
6795422204
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-03-03 12:12:56 +05:30
Rucha Mahabal
5eb42409c7
Merge branch 'develop' into healthcare_refactor
2020-03-03 09:22:11 +05:30
Rucha Mahabal
33fec1df54
feat: Patient Registration Web Form
2020-03-03 01:13:58 +05:30
Rucha Mahabal
77e84dfc35
fix: remove deprecated Appointment Analytics Tree Grid Report
2020-03-03 00:25:50 +05:30
Rucha Mahabal
5a92b3fc99
feat: set chart for Appointment Analytics
2020-03-03 00:24:43 +05:30
Rucha Mahabal
85aab34421
feat: Patient Appointment Analytics Script Report
2020-03-02 23:14:30 +05:30
Shivam Mishra
1f151c1032
refactor: update restrict to domain data
2020-03-02 19:37:12 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters ( #20807 )
2020-03-02 19:25:01 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports ( #20803 )
2020-03-02 19:10:29 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name ( #20805 )
...
* fix: fetch sales person name
* Update sales_person.js
Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 19:06:06 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer ( #20703 )
...
* fix: Excel support and UX fixes for chart of accounts importer
* fix: Linting Errors
* fix: Blank chart preview
* fix: Added template types for download
* fix: Description on template selection
* fix: Linting fixes
* fix: Move logic for download template to dialog
2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry ( #20794 )
...
* fix: Total amount not displayed in Journal Entry
* fix: Update paid_to_received field
* fix: set total amount
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable ( #20790 )
2020-03-02 17:50:05 +05:30
Lokesh Waingankar
38242bc21f
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1
feat: added base config for domains
2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Frappe PR Bot
eb2f79b16e
feat: Updated translation ( #20784 )
2020-03-02 16:52:42 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags ( #20774 )
2020-03-02 15:19:18 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no ( #20778 )
...
* feat: link serial no to batch no
* fix: test cases
2020-03-02 15:02:58 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco ( #20787 )
2020-03-02 15:01:06 +05:30
Rucha Mahabal
9565e62e3a
refactor: Clinical Procedure code
2020-03-02 12:11:38 +05:30
Rucha Mahabal
75626d63aa
fix: set consumable entries on client side and not on validate
2020-03-02 11:35:59 +05:30
Rucha Mahabal
5ec7b55c3c
fix: consumable total amount not set in Clinical Procedure
2020-03-02 10:17:15 +05:30
P-Froggy
f1014bb978
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-03-02 00:21:12 +01:00
P-Froggy
313efe9b32
fix: add missing semicolon
2020-03-02 00:21:08 +01:00
P-Froggy
3bf04154b1
Merge branch 'develop' into develop
2020-03-02 00:18:23 +01:00
Deepesh Garg
09188e4a21
fix: Remove fetch from loan_application.json
2020-03-01 22:16:27 +05:30
Rucha Mahabal
7c5947f041
fix: Batch not getting fetched in Clinical Procedure Item
2020-03-01 14:46:34 +05:30
Deepesh Garg
0c7b60aa99
Merge pull request #20768 from marination/buying-dashboard
...
chore: Rearranged Buying Module Dashboard
2020-02-29 17:33:51 +05:30
radhikag
86ecaa59ca
fix : Student Admission accepting end date less than start date. #20625
2020-02-29 12:47:03 +05:30
Deepesh Garg
2090d113e5
Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance
...
fix: Add loan to value ratio in loan security type
2020-02-29 09:01:27 +05:30
Deepesh Garg
eee7f77d47
fix: Add loan to value ratio in loan security type
2020-02-29 08:58:15 +05:30
P-Froggy
f9b3e4be78
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-02-28 20:46:41 +01:00
P-Froggy
266e689c4f
fix: Show swift number and branch code in quick entry of bank doctype
2020-02-28 20:46:36 +01:00
P-Froggy
393a626834
fix: Allow only bank accounts of the respective party in payment entry
2020-02-28 20:45:48 +01:00
Rucha Mahabal
d244ac9c3a
fix: status inconsistencies in Clinical Procedure
2020-02-28 19:25:26 +05:30
Rucha Mahabal
0ed4cabb5d
fix: make Clinical Procedure submittable
2020-02-28 19:24:38 +05:30
P-Froggy
55d10f77f9
fix: Add linked bank accounts to supplier dashboard
2020-02-28 13:14:11 +01:00
Rucha Mahabal
d76908d757
fix: Clinical Procedure Template code refactor
2020-02-28 13:30:43 +05:30
marination
24f4683999
chore: Rearranged Buying Module Dashboard
2020-02-28 12:58:41 +05:30
Deepesh Garg
5707c9a731
fix: Item Wise report query fix ( #20760 )
2020-02-28 12:28:54 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent ( #20759 )
...
This bug was introduces in the commit bd6e8b9cec
2020-02-28 12:27:21 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period ( #20502 )
2020-02-27 19:09:34 +05:30
Lokesh Waingankar
b252f5851d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-02-27 19:09:14 +05:30
Lokesh Waingankar
efb6482ef6
fix: user is not able to do 'Set as Lost' for Quotation ( #20689 )
2020-02-27 19:08:58 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails ( #20751 )
...
* feat: ignore permission when deleting linked emails
* fix: uncommented important snippet
2020-02-27 19:07:58 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission ( #20676 )
...
* perf: improve gl entry submission
* perf: add indexes
* fix: replace **kwargs with *args
* fix: syntax error
* fix: remove cypress
* fix: travis
* chore: remove purchase invoice from status updater
* fix: set_staus args
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
* fix: only update status for invoices & fees
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay ( #20727 )
...
* fix: deductions calculation based on gross pay
* test: salary structure deduction based on gross pay
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:31:18 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue ( #20747 )
2020-02-27 18:18:10 +05:30
Rucha Mahabal
8c5725c799
fix: change item_code from Link to Data to avoid item not found error
2020-02-27 17:18:52 +05:30
Deepesh Garg
d8d453d7d4
Merge pull request #20748 from deepeshgarg007/bank_reco_jv
...
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-27 16:18:27 +05:30
Deepesh Garg
f444f451ac
fix: Remove debug statement
2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-27 16:01:47 +05:30
Rucha Mahabal
61203b8701
fix: disabled Procedure Template shown as enabled in List View
2020-02-27 13:47:54 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM ( #20689 )
...
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228
* fix: Added condition for None purchase order and purchase receipt (#20689 )
* fix: fetch last purchase rate
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 13:21:14 +05:30
Rucha Mahabal
99321cd538
fix: conflicts
2020-02-27 13:16:53 +05:30
Rucha Mahabal
e29d5c1d5b
fix: Schedule Admission button not visible
2020-02-27 12:57:38 +05:30
Saqib
dd374ff77b
fix: only update items if rate or qty changed ( #20742 )
2020-02-27 12:51:31 +05:30
Rohan
d40a5d92c2
fix: sort Issues chronologically ( #20741 )
2020-02-26 18:54:14 +05:30
Marica
62ba320f5b
fix: Lock stock ledger entries that are being reposted. ( #20737 )
...
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
2020-02-26 18:51:13 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix ( #20733 )
...
* fix: Mandatory bank account error fix
* fix: SQL condition
2020-02-26 17:17:02 +05:30
Rucha Mahabal
a61bf44328
feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text
2020-02-26 17:11:19 +05:30
Deepesh Garg
c88a7f8317
fix: User permission for Loan repayment doctype
2020-02-26 16:49:58 +05:30
Rucha Mahabal
22351adac5
refactor: Patient Encounter
2020-02-26 16:05:43 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation ( #20636 )
...
* fix: validated leave allocation
* fix: changes requested
* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 14:50:57 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop
2020-02-26 13:21:38 +05:30
Deepesh Garg
9f4b46050f
Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api
...
fix: API fix for loan security pledge creation
2020-02-26 12:59:13 +05:30
Deepesh Garg
b5c5bdd671
fix: API fix for loan security pledge creation
2020-02-26 12:57:05 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule ( #20712 )
2020-02-26 12:51:46 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 ( #20731 )
2020-02-26 12:48:36 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop
...
fix: Changes done to get valid customer and employee list on payment entry form(#20498 )
2020-02-26 12:17:47 +05:30
abhijitkumbharInd
12bc43e495
fix: Education | Quiz accepting duplicate question #20622 ( #20708 )
2020-02-26 12:04:41 +05:30
sharmatripti
08fa7590ef
fix: Employee field should be filtered based on department on doctype Instructor ( #20705 )
...
* Fix: Filtered Employee based on Department on Instructor doctype (#20598 )
* Fix: Syntax error (#20598 )
* Fix: Syntax error (#20598 )
* Fix: Syntax error (#20598 )
* Fix: Syntax error (#20598 )
* fix : Filtered Employee based on Department on Instructor doctype (#20704 )
2020-02-26 12:02:37 +05:30
Rucha Mahabal
63d987f345
fix: fields fetched incosistently from appointment and patient
2020-02-26 11:59:37 +05:30
RJPvT
10aab65338
fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 ( #20702 )
2020-02-26 11:59:10 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries ( #20709 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 11:36:55 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order ( #20717 )
2020-02-26 11:28:08 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance ( #20723 )
2020-02-26 11:26:07 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field ( #20719 )
2020-02-26 11:25:34 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Deepesh Garg
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue
...
fix: account dashboard not working
2020-02-26 10:18:03 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account
...
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
2020-02-26 10:49:48 +13:00
Rucha Mahabal
41bd317e25
refactor: Patient Appointment status
2020-02-25 13:51:36 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return ( #20543 )
...
* fix: Paid amount updation for pos return
* fix: Remove console
* fix: Styling
* fix: get default mode of payment from POS profile
* fix: Add test cases
* fix: Codacy
2020-02-25 13:21:16 +05:30
Rucha Mahabal
7c66975040
feat: validate Customer creation for Patient during Appointment booking
2020-02-25 12:43:33 +05:30
Rucha Mahabal
5100e11fb6
fix: appointment reminders not working
2020-02-24 22:08:45 +05:30
Rucha Mahabal
24055e1552
refactor: Patient Appointment
2020-02-24 19:09:50 +05:30
Rohit Waghchaure
ebdf80ddb5
fix: account dashboard not working
2020-02-24 18:45:47 +05:30
Deepesh Garg
735ec98b61
Merge pull request #20623 from jprashant09/develop
...
fix: Future date of birth accepted at Sibling Detail section in Studen…
2020-02-24 18:30:27 +05:30
Deepesh Garg
aaea4e60b6
fix: Validation condition
2020-02-23 20:59:05 +05:30
Deepesh Garg
dee42de0fd
Merge pull request #20596 from PratikM34/develop
...
fix: restricted duplicate topics on Course doctype (#20594 )
2020-02-23 20:56:43 +05:30
Deepesh Garg
cd416bbaa6
Merge pull request #20617 from jsukrut/develop
...
fix: restricted duplicate courses on Program Enrollment doctype (#20611 )
2020-02-23 20:51:08 +05:30
Himanshu
83acff9680
Merge branch 'develop' into opportunity-fix
2020-02-21 19:47:41 +05:30
Deepesh Garg
6e53afd947
fix: Travis ( #20688 )
...
* fix: Travis
* fix: Update test records
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-20 23:33:35 +05:30
prssanna
3218730a16
fix: set query on change in opportunity_from value
2020-02-20 16:14:44 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13
...
fix: Additional salary can be created only for active employee
2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d
fix: Additional salary can be created only for active employee
2020-02-20 15:40:37 +05:30
Rohan
a29c87cfda
feat: remove unused route creation variable ( #20558 )
2020-02-20 13:28:03 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less ( #20535 )
...
* fix: skip earned leaves check for max leaves set to zero or less
* test: earned leaves creation
2020-02-20 13:25:55 +05:30
Deepesh Garg
a871d30a7d
Merge pull request #20607 from khushalti/develop
...
fix: validation on max group strength student group form
2020-02-20 13:23:04 +05:30
Deepesh Garg
a0021969ad
fix: Validation message
2020-02-20 13:22:28 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management
...
fix: odometer value was not syncing properly
2020-02-20 13:19:54 +05:30
Rohan
395b2b15b2
fix: apply url encoding to project names ( #20642 )
2020-02-20 12:59:32 +05:30
Mangesh-Khairnar
6f6e3a940b
fix: return null for attribute ( #20674 )
2020-02-20 12:58:54 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide ( #20644 )
...
* fix: defaults not set in doc created via Onboarding Slide
* fix: default company not set in Supplier
2020-02-20 12:57:21 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters ( #20671 )
2020-02-20 12:52:56 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls ( #20660 )
...
* chore: SINV set_status remove redundant function calls
* Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice ( #20666 )
2020-02-20 12:29:44 +05:30
Mangesh-Khairnar
2d7e024f00
fix: use system language to translate strings ( #20673 )
2020-02-20 12:24:29 +05:30
Saqib
56837bc09d
fix: check for available stock in product bundle's website warehouse ( #20681 )
2020-02-20 12:23:08 +05:30
Deepesh Garg
cc56b690eb
Merge pull request #20582 from alyf-de/fix_datev
...
fix(regional): update DATEV Export to DATEV-Format v7.0
2020-02-19 19:36:45 +05:30
Deepesh Garg
6870161292
Merge pull request #20669 from Alchez/dev-priority-issue
...
fix: show priority in Issue list view
2020-02-19 19:28:23 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop
...
fix: HSN/SAC Error while creating a new item and not selecting the fi…
2020-02-19 19:23:10 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash
...
feat(accounts): add german CoA "SKR03" (GnuCash)
2020-02-19 19:21:51 +05:30
Deepesh Garg
40546d8af9
Merge pull request #20663 from marination/stock-settings-query
...
fix: Set Query on warehouse fields in Stock Settings
2020-02-19 18:57:24 +05:30
Anurag Mishra
1a11cb5a07
test: syncing of odometer value
2020-02-19 16:46:00 +05:30
Rohan Bansal
e5b59c781f
fix: show priority in Issue list view
2020-02-19 13:13:24 +05:30
marination
120f75026f
fix: Server side validation for Warehouses
2020-02-19 11:17:58 +05:30
Deepesh Garg
5632712d00
Merge pull request #20634 from scmmishra/tree-fix-qms-dev
...
fix: filters for quality_procedure tree
2020-02-19 09:41:18 +05:30
marination
bde13b98e0
fix: Set Query on warehouse fields in Stock Settings
2020-02-18 21:35:59 +05:30
Khushal Trivedi
8773dc3ffe
fix: student max gropu cannot be zero or less than zero
2020-02-18 19:37:21 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop
...
fix: Plaid fixes and enhancements
2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5
fix: Styling and minor fixes
2020-02-18 18:04:09 +05:30
racitup
f2fb963986
Ignore codacy SQL injection warning (internal code only) and add copyright notice
2020-02-18 17:52:07 +05:30
racitup
805c3efa59
fix: manually added patch for bank reconciliatio fields since develop branch was in a different place
2020-02-18 17:51:47 +05:30
racitup
547a0bb909
fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions
2020-02-18 17:49:57 +05:30
racitup
719678957a
fix: Bank Reconciliation Bank Account and Bank Account No field names
2020-02-18 17:49:45 +05:30
racitup
3c5bb80b5a
fix: Plaid transaction import order, transaction_id duplicate check, added transaction category tags
2020-02-18 17:49:35 +05:30
racitup
9a47c3dc8c
fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343
2020-02-18 17:49:20 +05:30
racitup
1548e20b78
fix: KeyError about bank_account_no due to non-existent field: #20343
2020-02-18 17:49:08 +05:30
racitup
7cda218af3
fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343
2020-02-18 17:48:54 +05:30
Khushal Trivedi
3a196b09ee
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-02-18 17:48:18 +05:30
Deepesh Garg
33ad0dafcb
Merge pull request #20604 from AnilPise/develop
...
fix: Parent Department filter while creating a new department
2020-02-18 17:44:51 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report ( #20573 )
...
* feat: Group by AR/AP report
* fix: Do not consider total row in charts
* fix: Subtotal row for last party
2020-02-18 16:07:34 +05:30
Deepesh Garg
ecba5c40bb
Merge pull request #20657 from anuradha-8/develop
...
fix: date of birth cannot be greater than today on student application form
2020-02-18 14:10:47 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix
...
fix: disabled mode of payments fetches in sales invoices
2020-02-18 12:38:06 +05:30
rohitwaghchaure
15ca1181f8
Merge pull request #20654 from marination/precision-mr-item
...
fix: Stock Quantity not calculated on client side in Material Request Items.
2020-02-18 12:34:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Anuradha Kalaskar
93e8fc1833
fix: date of birth cannot be greater than today on student application form
2020-02-18 11:32:35 +05:30
Khushal Trivedi
1153de1965
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-02-18 11:16:53 +05:30
marination
e143983819
fix: Stock Quantity not calculated on client side in Material Request Items.
2020-02-18 10:51:54 +05:30
P-Froggy
3cb9f4ab73
Add address and contact fields to bank
...
Address and contact fields are enabled for DocType Bank
2020-02-18 02:14:03 +01:00
P-Froggy
e4d8ee5ba8
Revert "Added bank account reference in supplier dashboard"
...
This reverts commit 7ee8a20964
2020-02-18 01:05:19 +01:00
P-Froggy
4cc929cabb
Move SWIFT-number and branch-code from bank account to bank
...
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
2020-02-18 00:38:46 +01:00
abhijitkumbharIND
0047fcf7ad
fix: HSN/SAC Error while creating a new item and not selecting the field. #20590
2020-02-17 18:12:58 +05:30
P-Froggy
7ccb8b6707
Revert "Merge pull request #1 from P-Froggy/patch-1"
...
This reverts commit 79c5266d0dbd582cfc39
2020-02-17 11:33:10 +01:00
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order ( #20371 )
...
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order
* fix: Query with filters, UX enhancements and cleanup
2020-02-17 15:58:08 +05:30
indictrans
68fa65edd1
fix: Throw message
2020-02-17 14:55:56 +05:30
indictrans
a840889dd7
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-02-17 14:46:40 +05:30
thefalconx33
23e728612f
fix: disabled mode of payments fetches in sales invoices
2020-02-17 14:15:20 +05:30
Deepesh Garg
a6701aa7bc
Merge pull request #20569 from Er-Naren719/feat-user-table-columns-updated
...
feat: columns under user table updated
2020-02-17 11:15:05 +05:30
Shivam Mishra
c14f49c079
fix: filters for quality_procedure tree
2020-02-17 11:12:28 +05:30
Deepesh Garg
5894c2d005
Merge pull request #20595 from anuradha-8/develop
...
fix: to date cannot be less than from date validation on student leave application form
2020-02-17 10:57:29 +05:30
Deepesh Garg
fd182b80ac
Merge pull request #20616 from Darpan245/develop
...
fix: Mandatory field property failed to work based on the selection of…
2020-02-17 10:35:56 +05:30
P-Froggy
7ee8a20964
Added bank account reference in supplier dashboard
2020-02-17 00:15:29 +01:00
P-Froggy
ab92e330da
Fix: Wrong filter for supplier default bank account
...
The query for default bank account field in the supplier master only allowed company bank accounts. With this fix it's now possible to one of the supplier bank accounts as default bank account.
2020-02-16 23:08:32 +01:00
P-Froggy
b3712158ae
Bank accounts reference in supplier dashboard
...
Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.
2020-02-16 19:10:53 +01:00
indictrans
ad5da823e1
fix:Future date of birth accepted at Sibling Detail section in Student form #20619
2020-02-16 22:59:41 +05:30
shrikant dixit
e329d417d6
fix: Added validation for student DOB can not be greater than Joining Date
2020-02-15 18:20:05 +05:30
indictrans
1118ee07a8
fix:Future date of birth accepted at Sibling Detail section in Student form #20619
2020-02-15 17:37:39 +05:30
jsukrut
c0fd30a7ec
fix: Indentation
2020-02-15 17:33:52 +05:30
jsukrut
c3a23ddbe3
fix: restricted duplicate courses on Program Enrollment doctype ( #20611 )
2020-02-15 16:39:51 +05:30
Yugandhara
ce1f6a73e2
fix: Changes done to get valid sales order list on production plan form( #20609 )
2020-02-15 16:31:53 +05:30
jsukrut
3a6ca13b44
fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605
2020-02-15 16:18:17 +05:30
Yugandhara
e997168a23
fix: unused variable cdn removed
2020-02-15 16:14:46 +05:30
Yugandhara
af2b39891e
fix: Changes done to get valid sales order list on sales order child table of production plan
2020-02-15 16:01:41 +05:30
anil pise
7c474130ea
fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed.
2020-02-15 15:58:57 +05:30
Khushal Trivedi
dc39b4ba13
fix: validation on max group strength student group form
2020-02-15 15:38:16 +05:30
anil pise
21b1a00f61
Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599
2020-02-15 15:23:15 +05:30
pratik.m
c224cf761f
fix: restricted duplicate topics on Course doctype ( #20594 )
2020-02-15 13:22:17 +05:30
Anuradha Kalaskar
21d662f96d
fix: to date cannot be less than from date validation on student leave application
2020-02-15 13:17:57 +05:30
Yugandhara
ad645afeb2
fix: Changes done to get valid customer and employee list on payment entry form
2020-02-15 10:56:41 +05:30
Raffael Meyer
772394b95a
fix header
2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993
update cloumn names
2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b
quote format name
2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6
update TRANSACTION_COLUMNS according to "DATEV Format v7.0"
2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba
update header accoding to "DATEV Format v7.0"
2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174
consutant number and client number are mandatory
2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b
generated on is datetime, not date
2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb
add format version (data type)
2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e
bump version number
2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b
EXTF must be in quotes
2020-02-13 17:02:01 +01:00
rohitwaghchaure
c2c12dc82f
Merge pull request #20572 from abhijitkumbharInd/develop
...
Production Plan | Get items from Sales Order not fetching grand total value
2020-02-13 10:09:24 +05:30
Raffael Meyer
0fac1f9429
Add groups for account types "Bank" and "Cash"
2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355
Merge branch 'develop' into skr03_gnucash
2020-02-12 13:58:53 +01:00
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses
2020-02-12 13:22:05 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop
2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush
...
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-11 19:50:36 +05:30
abhijitkumbharIND
a67ae3ad31
fix: Production Plan | Get items from Sales Order not fetching grand total value. #20568
2020-02-11 16:45:59 +05:30
Rucha Mahabal
ba740ff558
feat: show linked Sales Invoice in Patient Appointment after booking
2020-02-11 16:27:22 +05:30
Er-Naren719
94e14257fb
feat: column width increased for view attachments field ( #314 )
2020-02-11 15:21:48 +05:30
Deepesh Garg
65a53ba86c
Merge pull request #20565 from vishdha/filter_serial_based_on_batch_v13
...
fix: filter serial no based on batch no
2020-02-11 13:45:21 +05:30
Deepesh Garg
93b98774e7
Merge pull request #20519 from ahmad18189/patch-3
...
automatic booking of asset depreciation fix
2020-02-11 13:44:29 +05:30
Rucha Mahabal
4dd6f0ae9b
fix: non-empty service unit set as empty after booking appointment
2020-02-11 13:39:18 +05:30
vishal
998de83d48
fix: filter serial no based on batch no
2020-02-11 12:24:44 +05:30
Deepesh Garg
97669e975d
fix: Update condition
2020-02-11 10:18:39 +05:30
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop
...
fix: added indexing on columns to fix performace issue
2020-02-11 10:12:49 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register ( #20251 )
...
* fix: Group by sales register report
* fix: Remove group-by item
* fix: Grand total query fix
* fix: Remove debug param
* fix: Code cleanup and commonification
* fix: Add group by functionality to purchase register
* fix: Changes in total row display
* fix: Minor fixes
* fix: Add total row
* fix: Do not calculate total for rate
2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3
fix: added indexing on columns to fix performace issue
2020-02-10 15:56:56 +05:30
Rohit Waghchaure
e55a927eee
fix: test cases
2020-02-10 14:39:26 +05:30
Deepesh Garg
930e61d6e3
Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix
...
fix: mandatory warehouse wrror while updating items after submission
2020-02-10 12:09:11 +05:30
ashish-greycube
121636f9bf
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-10 10:49:50 +05:30
Rucha Mahabal
cf3c8174f6
Merge branch 'develop' into fix_regional_data
2020-02-10 00:40:21 +05:30
Rucha Mahabal
8334a3a1fd
fix: patch for creating irs_1099 custom field (United States)
2020-02-10 00:34:09 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups ( #20547 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-09 21:23:53 +05:30
thefalconx33
9225159d8c
fix: mandatory warehouse wrror while updating items after submission
2020-02-09 12:19:03 +05:30
Rohit Waghchaure
f0d27528e3
fix: time out error while submitting the purchase receipt which has more than 100 serial nos
2020-02-07 14:42:33 +05:30
Deepesh Garg
ed5c05b0f7
Merge pull request #20533 from rohitwaghchaure/procurement_tracker_not_working_for_special_char_company_name
...
fix: Procurement Tracker report not working
2020-02-07 10:43:11 +05:30
Rohan Bansal
d64f92cf99
fix: show WFH in monthly attendance sheet report
2020-02-06 17:30:57 +05:30
Rohit Waghchaure
07f3312804
fix: Procurement Tracker report not working
2020-02-06 14:34:11 +05:30
Deepesh Garg
eeb4c3629c
Merge pull request #20529 from nextchamp-saqib/mv-fix-develop
...
fix: typo; serial no doesn't have amc start date
2020-02-06 13:56:10 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline
...
feat: add territory wise sales report
2020-02-06 13:11:07 +05:30
thefalconx33
fcae88a514
fix: typo; serial no doesn't have amc start date
2020-02-06 13:00:47 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param
2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b
fix: Add report link in module view and fix date filter
2020-02-06 12:50:25 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance ( #20487 )
...
* fix: full day leaves not tagged as half day in attendance
* chore: code cleanup for half day date value set
2020-02-05 15:01:13 +05:30
0Pranav
9d9a3d85d8
fix: filters after rename
2020-02-05 14:17:21 +05:30
Anurag Mishra
eacc1bc2dc
fix: requested changes
2020-02-05 12:45:43 +05:30
Deepesh Garg
30e766b228
fix: SQL query in financial statements
2020-02-05 12:12:47 +05:30
Ahmad M Abdelrahman
41e7163476
automatic booking of asset depreciation fix
...
Stop Automatic deprecation is not working
2020-02-05 08:33:53 +02:00
Rucha Mahabal
50b67792ca
fix: remove check availability button from form
2020-02-03 23:45:14 +05:30
Rucha Mahabal
513b443861
fix: make check availability as the primary action button
2020-02-03 23:42:21 +05:30
Rucha Mahabal
4d9d51d91c
fix: get prescribed procedures button not working
2020-02-03 22:29:32 +05:30
Rucha Mahabal
217e1b41fb
refactor: Appointment Type, add dashboard
2020-02-03 21:55:52 +05:30
Rucha Mahabal
6ffdbcbcd7
feat: show Patient Appointment status in List View
2020-02-03 21:23:02 +05:30
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher ( #20493 )
...
* fix: Unable to submit landed cost voucher
* fix: Test case for multiple landed cost voucher against a Purchase receipt
* fix: Test Case
2020-02-03 18:53:34 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter ( #20104 )
...
* feat: appointment Letter
* fix: requested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-03 17:52:42 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view ( #20452 )
2020-02-03 17:05:26 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order
...
feat: added source warehouse field in the work order
2020-02-03 16:32:19 +05:30
Himanshu
10b3b79c0f
fix(Report): query report for Quality Action ( #20424 )
...
* fix: query report for QA
* fix: add QM permission
* fix: add QM permission
2020-02-03 16:16:49 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer ( #20465 )
...
* fix: Label and UX fixes while creating payment entry against customer
* fix: filter
2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile ( #20413 )
...
* feat: add tax category in pos profile
* fix: review fixes
2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements ( #20486 )
2020-02-03 15:49:24 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code ( #20500 )
...
* fix: gst permission for gst settings & hsn code
* Fix: typo
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-03 15:40:35 +05:30
Frappe PR Bot
ba0712a429
feat: Updated translation ( #20490 )
2020-02-03 14:58:03 +05:30
Frappe PR Bot
1478282920
feat: Updated translation ( #20499 )
2020-02-03 14:57:43 +05:30
0Pranav
9c4399e1f2
fix: better syntax for checking empty arrays
2020-02-03 14:57:42 +05:30
Deepesh Garg
943de261bb
Merge pull request #20505 from deepeshgarg007/button_shift
...
fix: Move E-Way bill button under create
2020-02-03 14:50:54 +05:30
Rucha Mahabal
b010988033
feat: add dashboards to Healthcare Masters
2020-02-02 23:22:02 +05:30
Rucha Mahabal
0a35b2207e
refactor: Healthcare masters
2020-02-02 23:21:18 +05:30
Deepesh Garg
cce3ac9f79
fix: Move E-Way bill button under create
2020-02-02 21:25:58 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application
...
feat: request for work from home marked in attendance
2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6
fix: test added to check work from home application
2020-01-31 14:30:38 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new
...
fix: Do not show any finance book record if no finance book filter is applied
2020-01-31 13:19:16 +05:30
Rohit Waghchaure
adbe291498
feat: added source warehouse field in the work order
2020-01-31 13:09:06 +05:30
Rucha Mahabal
d089029bb4
fix: disabled practitioner schedule shown as enabled in list view
2020-01-31 12:32:42 +05:30
Deepesh Garg
34c33baa82
fix: Cash flow filter fix
2020-01-31 11:16:30 +05:30
0Pranav
b1473c3de0
fix: return empty array
2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5
various fixes from review
...
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
2020-01-31 10:35:47 +05:30
Deepesh Garg
ba44f28202
fix: Filtering fixes in financial statement
2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8
fix: Do not show any finance book record if no finance book filter is applied
2020-01-30 15:33:51 +05:30
Suraj Shetty
0860865763
Merge branch 'develop' into fix-incorrect-translations
2020-01-30 15:12:33 +05:30
Parth Kharwar
5342c846d2
feat: request for work from home marked in attendance
2020-01-30 13:12:56 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test
2020-01-30 13:03:05 +05:30
Parth Kharwar
2bccd7f717
fix: rename breadcrumb for Brand DocType from Selling to Stock
2020-01-30 12:12:42 +05:30
Suraj Shetty
082020184a
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-30 10:46:11 +05:30
Raffael Meyer
e21cd5e7f1
fix: account number for "Kasse"
2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218
fix: add missing account types
2020-01-29 22:21:19 +01:00
Rucha Mahabal
be29a24de5
refactor: Patient master
2020-01-29 22:22:39 +05:30
Deepesh Garg
d89fbc56d9
Merge pull request #20464 from Alchez/dev-wfh
...
feat(hr): add work from home option in status
2020-01-29 20:12:40 +05:30
Diksha
480d52c6f3
feat(attendance): add work from home option in status
2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Pranav Nachnekar
d64135b2d2
fix: linking party in calendar event of appointment ( #20458 )
2020-01-29 13:01:25 +05:30
Rucha Mahabal
a4202d1660
fix: disabled patient shown as enabled
2020-01-29 11:33:29 +05:30
Deepesh Garg
47ba65edc0
Merge pull request #20459 from 0Pranav/fix-supplier-quotation-button
...
fix: missing plus button in request for quotaion for supplier quotation
2020-01-29 10:46:21 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column
...
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma
2020-01-29 09:49:26 +05:30
0Pranav
d4c0184f3f
fix: missing plus button in request for quotaion for supplier quotation
2020-01-29 09:32:40 +05:30
Deepesh Garg
217517a61f
Merge pull request #20455 from toxnico/develop
...
fix: french translation correction
2020-01-29 08:39:38 +05:30
Rucha Mahabal
c7417c08ed
refactor: Healthcare Settings
2020-01-28 18:06:23 +05:30
Pranav Nachnekar
c1312700e8
feat: create appoitnemnt against customer ( #20457 )
2020-01-28 17:50:47 +05:30
Nicolas Simonnet
10ffaf4e89
french translation correction
2020-01-28 11:45:57 +01:00
marination
372c5e51d5
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-28 16:04:49 +05:30
rohitwaghchaure
da9a3936e1
fix: incorrect work order qty for sub assembly items ( #20449 )
2020-01-28 14:34:27 +05:30
Nabin Hait
2bb3a62b1a
fix: cannot complete task if dependent task are not completed / cancelled ( #20437 )
2020-01-28 14:08:53 +05:30
Anurag Mishra
3496104ebe
fix: odometer value was not syncing properly
2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861
fix: Parent company defaulting on creation of new company ( #20422 )
...
* fix: Parent company defaulting on creation of new company
* fix: Test Cases
* fix: Test Cases
* fix: Test Cases for staffing plan
2020-01-28 12:54:45 +05:30
Pranav Nachnekar
3fb48ebf61
fix: discounting not applied on sales invoice created by subscriptions ( #20431 )
2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f
fix: Column 'project' in where clause is ambiguous ( #20438 )
...
* fix: Column 'project' in where clause is ambiguous
* fix: Fixed alias in query
2020-01-28 12:43:38 +05:30
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch
...
fix: only fetch driver address if not set (develop)
2020-01-28 09:20:26 +05:30
Don-Leopardo
f6d5073832
Merge branch 'develop' into fix_sqlinjection_develop
2020-01-27 13:56:01 -03:00
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item
...
fix: to warehouse not set in the customer warehouse
2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9
fix: only fetch driver address if not set
2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f
fix: to warehouse not set in the customer warehouse
2020-01-27 17:56:25 +05:30
NahuelOperto
be1895fd08
Fix sql injection
2020-01-27 09:02:02 -03:00
Saqib
e009187e02
refac: filters and columns of fixed asset register report ( #20332 )
2020-01-27 16:05:55 +05:30
Parth J. Kharwar
011c13b3cc
fix: employee checkin doctype time permissions ( #20403 )
2020-01-27 16:03:24 +05:30
Shivam Mishra
149b4e5985
chore: warn bom naming conflict ( #20244 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-27 15:20:30 +05:30
Deepesh Garg
ef41a0eda5
fix: Finance book filtering in financial statements ( #20410 )
...
* fix: Finance book filtering in financial statements
* fix: Use IS NULL instead of ifnull
2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1
fix: incorrect status for fraction of outstanding amount ( #20369 )
2020-01-27 14:22:43 +05:30
Himanshu Warekar
e169d2964c
fix: change fieldtype to Text
2020-01-24 17:40:29 +05:30
Saqib
9291df4d4c
fix: wrong outstanding invoices fetched against employee ( #20373 )
2020-01-24 16:22:49 +05:30
Anurag Mishra
ce00f6cf70
fix: Duplicate Attendance Due Wrong Date format ( #20390 )
2020-01-24 16:14:50 +05:30
Rucha Mahabal
0a27c98a99
fix(Healthcare): disabled Lab Test Template shown as Enabled in List View ( #20378 )
...
* fix (Healthcare): disabled Lab Test Template shown as enabled in List View
* fix: remove custom disabled button and unhide disabled field
2020-01-24 16:12:08 +05:30
Marica
40dffab79e
fix: Product Page non-stock item status ( #20383 )
2020-01-24 15:52:27 +05:30
Rucha Mahabal
72c3dd1d11
fix: healthcare settings registration fee NoneType error ( #20395 )
2020-01-24 15:50:44 +05:30
Frappe PR Bot
84afdfdb4c
feat: Updated translation ( #20404 )
2020-01-24 14:21:53 +05:30
rohitwaghchaure
573de02f60
Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop
...
fix: add serial no button not working
2020-01-24 13:49:41 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort
...
fix: Order GL entries by creation time in General ledger
2020-01-24 13:19:39 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop
...
fix: unlink references from batch on cancellation of stock transactions
2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4
delete the auto created batch
2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476
fix: Order GL entries by creation time in General ledger
2020-01-23 17:42:57 +05:30
Rohit Waghchaure
067e8ad50d
fix: add serial no button not working
2020-01-23 15:49:39 +05:30
Deepesh Garg
f2d3bd71c9
Merge pull request #20356 from abhijitkumbharInd/develop
...
fix: Gives a 404 error when clicked on the Download Required Material…
2020-01-23 15:45:42 +05:30
Deepesh Garg
1d279c30bb
Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop
...
fix: lead date comparison issue
2020-01-23 15:22:53 +05:30
Deepesh Garg
b83f5cee6c
Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop
...
fix: lead details duplicate entries
2020-01-23 15:20:47 +05:30
Deepesh Garg
32be74e40d
Merge pull request #20381 from nextchamp-saqib/small-fix-asset
...
fix: tuple index out of range error
2020-01-23 15:03:00 +05:30
Rohit Waghchaure
4f4dbf1996
fix: unlink references from batch on cacnellation of stock transactions
2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0251e33f31
fix: lead details duplicate entries
2020-01-22 16:59:36 +05:30
Rohit Waghchaure
7b8e1e0891
fix: lead date comparison issue
2020-01-22 16:36:14 +05:30
thefalconx33
e7154f155b
fix: tuple index out of range error
2020-01-22 12:22:55 +05:30
Rohit Waghchaure
0cc4cf2cf5
fix: Zero division error while making finished good entry against the work order
2020-01-21 19:28:08 +05:30
abhijitkumbharIND
0eb6f06685
fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved ( #20355 )
2020-01-21 19:16:32 +05:30
abhijitkumbharIND
b2f08a7a42
fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved ( #20355 )
2020-01-21 19:16:32 +05:30
byugandhara
239f0d529e
Fix: Spelling correction in throw message of stock entry( #20337 ) ( #20353 )
2020-01-21 15:47:27 +05:30
rohitwaghchaure
5056c8bcb4
fix: not able to import chart of account if parent account is missing ( #20368 )
2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38
fix: account not added to child company ( #20361 )
2020-01-21 15:25:51 +05:30
Nabin Hait
50cb49cb00
fix: Don't fetch price list rate on change of qty ( #20363 )
2020-01-21 13:04:21 +05:30
KanchanChauhan
a7d1985b5f
fix: Set Quotation expired if not Ordered or Lost ( #20354 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-01-21 12:35:11 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation
2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067
fix: nonetype issue in the total leaves calculation
2020-01-20 18:02:23 +05:30
rohitwaghchaure
6ae61a1693
fix: incorrect number of gl entries issue ( #20352 )
2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa
fix: 'get_additonal_costs' is not defined ( #20344 )
...
* fix: 'get_additonal_costs' is not defined
* fix: Re-added get_items on Work order change.
2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty ( #20347 )
2020-01-20 15:45:04 +05:30
Himanshu Warekar
7be9120730
fix: remove email_append_to from hooks
2020-01-19 15:05:26 +05:30
Himanshu Warekar
303f085499
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-19 11:45:24 +05:30
Mangesh-Khairnar
2ac8473abf
fix: calculate remaining leave balance
2020-01-17 22:46:26 +05:30
Nabin Hait
444156184c
fix: Plaid TypeError in add_bank_accounts ( #20335 )
2020-01-17 15:57:48 +05:30
Jigar Tarpara
f5374c182e
Bug Fix ( #20330 )
...
* Bug Fix
auto_close_after_days field is in Selling Settings
* fix: close_opportunity_after_days field is in selling settings
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-17 11:54:25 +05:30
Parth Kharwar
0a581c096b
chore: changed employee contact field name
2020-01-17 11:50:35 +05:30
Rohan
ef734ee850
fix: handle default value for batch size in BOM operation ( #20328 )
2020-01-17 11:45:54 +05:30
Vishal Dhayagude
2ae87876b6
fix: salary structure assignment filter employee based on company ( #20318 )
...
* fix: pick company from employee salary structure
* fix: Salary structure assignment fetch company from enmployee
* Revert "fix: Salary structure assignment fetch company from enmployee"
This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.
* fix: Salary structure assignment fetch company from enmployee
* fix: filter on company for salary structure assignment
* fix: minor changes
* fix: minor changes
* fix: added company to salary strucutre assignment
2020-01-17 11:44:11 +05:30
Himanshu
e3afe8a73c
fix: don't hide primary_address_and_contact_detail ( #20322 )
2020-01-16 13:39:29 +05:30
Saqib
bcb6130bbe
fix: hide total amount field from journal entry PF ( #20324 )
2020-01-16 13:38:43 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch ( #20301 )
...
* fix: Multiple fixes based on testing on pre-release branch
* fix: reload hr settings
2020-01-16 13:37:25 +05:30
rohitwaghchaure
3cbb4cbad9
Merge pull request #20315 from PawanMeh/fix_20314
...
fix: Italian invoicing supplier name issues
2020-01-16 11:43:14 +05:30
rohitwaghchaure
d821c58a5e
fix: capacity planning validation ( #20317 )
2020-01-16 11:29:08 +05:30
Pawan Mehta
687cbc7c0c
fix : #20314
2020-01-15 23:44:36 +05:30
Vishal Dhayagude
654d785776
fix: Delivery note not able to create sales return ( #20264 )
2020-01-15 19:28:58 +05:30
Marica
9f6c95549a
fix: Applied query on PO Supplier popup field in Material Request. ( #20231 )
2020-01-15 19:24:28 +05:30
Marica
4e6b3ada0f
fix: Missing argument in status updater ( #20281 )
2020-01-15 19:22:35 +05:30
Saqib
b0b179f1b7
fix: make jv depreciations only if calculate depr is checked ( #20282 )
2020-01-15 19:05:35 +05:30
Wolfram Schmidt
a346469e0c
Update de.csv ( #20292 )
...
Missing translation
2020-01-15 19:04:39 +05:30
sahil28297
32d643ed3c
fix(patch): reload tax category ( #20308 )
2020-01-15 18:57:54 +05:30
sahil28297
596a072d5f
fix(patch): do not append taxes to template if account name is not set ( #20312 )
2020-01-15 18:56:36 +05:30
Saqib
617a24191f
fix: get existing payment req amount only from unpaid req ( #20289 )
2020-01-15 16:36:13 +05:30
rohitwaghchaure
61ad6292d6
fix: incorrect number of GL Entries error in stock entry ( #20299 )
2020-01-15 16:35:31 +05:30
Suraj Shetty
71ed1d42e2
Merge branch 'develop' into cancel_frappe_1
2020-01-15 11:22:44 +05:30
Shivam Mishra
a59c2ce17a
fix: profit and loss indicator bug
2020-01-14 17:55:49 +05:30
Shivam Mishra
748c3d9e8b
feat: update profit and loss for new report summary API
2020-01-14 17:31:19 +05:30
0Pranav
6280609c25
enhancement: add territory wise sales report
2020-01-14 15:53:35 +05:30
Suraj Shetty
080d136fd7
fix: Improper escaping ( #20248 )
...
* fix: Improper escaping
issue was introduced in https://github.com/frappe/erpnext/pull/20202
* fix: missing closing parentheses
* style: trim unwanted spaces
Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>
2020-01-14 12:55:03 +05:30
rohitwaghchaure
7894caf397
Merge pull request #20276 from rohitwaghchaure/fixed_report_stock_and_account_value_comparison
...
fix: filter issue for the stock and account value comparison report
2020-01-14 12:18:39 +05:30
Rohit Waghchaure
9650c25429
fix: filter issue for the stock and account value comparision report
2020-01-14 12:12:54 +05:30
Saqib
1218160c70
fix: payment entry can be created against on hold PI ( #20270 )
2020-01-14 12:07:24 +05:30
Deepesh Garg
7420fccbee
Merge pull request #20269 from rohitwaghchaure/fixed_delivery_date_not_able_to_change_after_submit
...
fix: allow on submit for the delivery date field
2020-01-14 10:00:10 +05:30
Saqib
b8bcad5850
fix: gl not generated on manual asset creation ( #20265 )
2020-01-13 18:17:05 +05:30
Himanshu Warekar
c9f497d7c0
feat: move subject and sender fields to json
2020-01-13 16:26:40 +05:30
Himanshu Warekar
e5692e035a
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-13 15:17:32 +05:30
Deepesh Garg
2d151a7b85
fix: Remove patch to set automatic tax fetching from item tax template ( #20234 )
2020-01-13 15:09:27 +05:30
Suraj Shetty
06ed72a859
Merge branch 'develop' into cancel_frappe_1
2020-01-13 15:08:23 +05:30
Deepesh Garg
70a58d333b
Merge pull request #20245 from nextchamp-saqib/asset-cancel-fix
...
fix: auto cancel if movement exists
2020-01-13 14:44:45 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix
...
fix: remove default customer as party type
2020-01-13 13:48:55 +05:30
vishal
dcef798be7
fix: minor changes
2020-01-13 12:59:52 +05:30
vishal
1dd289450f
fix: docstring for auto cancel
2020-01-13 12:59:18 +05:30
vishal
eef05758b6
feat: Added docinfo for auto cancel exempt doctypes
2020-01-13 12:59:18 +05:30
vishal
70148a6748
feat: docstring added for auto cancel exempt doctypes
2020-01-13 12:59:12 +05:30
thefalconx33
f04d054faa
fix: remove default customer as party type
2020-01-13 12:43:49 +05:30
Rohit Waghchaure
ecdfc1a15c
fix: allow on submit for the delivery date field
2020-01-13 12:43:26 +05:30
thefalconx33
1e7a127dfa
fix: auto cancel if movement exists
2020-01-11 14:19:02 +05:30
deepeshgarg007
00746306a3
fix: Item tax template fetching from HSN Code
2020-01-10 15:01:50 +05:30
gavin
12568e4f07
Merge pull request #19514 from gavindsouza/rename-doc-fix
...
fix: frappe.rename_doc update
2020-01-09 15:07:05 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
Suraj Shetty
000ac0068b
Merge branch 'develop' into rename-doc-fix
2020-01-09 13:46:08 +05:30
Marica
287f491f7b
fix: Employee name in Report trial balance for party ( #20223 )
...
* 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:35:06 +05:30
Pranav Nachnekar
1612432f45
fix: parent item should not appear in raw material request dialog ( #20216 )
2020-01-09 13:32:15 +05:30
Don-Leopardo
ccdf19314d
fix: min_qty and valid_from for the price selection ( #20217 )
2020-01-09 12:24:43 +05:30
Pranav Nachnekar
229e5398b5
fix: escape % in customer name ( #20202 )
2020-01-09 12:21:26 +05:30
Marica
c72de6edaa
fix: Added description and title to supplier selection popup in Material Request. ( #20179 )
2020-01-07 13:06:08 +05:30
Vishal Dhayagude
7ae11005c4
fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application ( #20211 )
2020-01-07 13:02:13 +05:30
Vishal Dhayagude
6b316cd7cb
feat: Backdated leave application ( #20201 )
...
* fix: only HR Managers can make backdated leave applications
* fix (leave application): error message changed and user check modified
* fix: Move hardcoded logic to HR Settings
* fix: added role as mandetory field on check restict field
* fix: minor changes
2020-01-07 11:48:38 +05:30
Wolfram Schmidt
aab96b7fbf
Update de.csv ( #20205 )
...
changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)
2020-01-07 11:37:08 +05:30
sahil28297
88737e38f2
fix(item_tax_template): fetch parent account if not set ( #20198 )
2020-01-07 11:30:22 +05:30
Pranav Nachnekar
971458043d
fix: add new delivery note button in Sales Order ( #20199 )
...
* 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:35 +05:30
Rohan
7c8aaba449
fix: integer UOM check in transactions ( #20176 )
2020-01-07 11:23:53 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* 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-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request
...
fix: incorrect party type in payment request
2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77
fix: party type in payment request
2020-01-06 15:07:06 +05:30
rohitwaghchaure
055012a7fb
Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate
...
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
2020-01-06 12:07:53 +05:30
rohitwaghchaure
fe2afc643e
fix: incorrect valuation rate for finished good entry ( #20165 )
2020-01-06 11:51:43 +05:30
Deepesh Garg
92f3149a64
Merge pull request #20185 from mujeerhashmi/fee-write-off
...
feat: Allow write-off for Fees doctype in journal entry.
2020-01-06 08:09:16 +05:30
Himanshu
9496b8453f
fix(plaid): change json structure ( #20189 )
2020-01-06 00:17:16 +05:30
Syed Mujeer Hashmi
03bf1a875f
feat: Allow write-off for Fees doctype
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-01-04 13:26:42 +05:30
Marica
159799c238
Merge branch 'develop' into item-min-qty
2020-01-03 12:13:00 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop
...
fix: ignore pricing rule for other item group
2020-01-02 19:24:37 +05:30
thefalconx33
7a01367ef1
ux: add description for minimum purchase qty
2020-01-02 19:14:55 +05:30
Nabin Hait
328c4f9b92
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
2020-01-02 19:00:47 +05:30
Rohit Waghchaure
660a78b877
fix: ignore pricing rule for other item group
2020-01-02 17:31:09 +05:30
deepeshgarg007
473b478883
fix: Show closing row in general ledger print
2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431
feat: add accounts and account types
2020-01-01 22:55:54 +01:00
Rucha Mahabal
2d293c585e
fix(Subscription): pass start_date while computing next_schedu… ( #20159 )
2019-12-31 19:15:37 +05:30
Anurag Mishra
8554304616
fix: set currency to company default currency ( #20157 )
2019-12-31 17:23:31 +05:30
Rohan
938ba3efc4
feat: show item name in Item Price list view ( #20156 )
2019-12-31 17:21:07 +05:30
Saqib
440a3b75be
fix: don't show transfer button if already items are supplied ( #20154 )
2019-12-31 17:20:04 +05:30
Nabin Hait
5748cde54b
fix: minor field arrangements
2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70
fix: Employee incentive form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9
fix: Employee form UI
2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec
feat: Mark Unmarked Attendance ( #20062 )
...
* feat: Mark Unmarked Attendance
* Update shift_type.py
* Update attendance_list.js
* Update attendance.py
* Update attendance.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-31 17:09:56 +05:30
Rohan
b73b347697
feat: add job applicant's email in job offer ( #20153 )
2019-12-31 17:09:02 +05:30
Javier Wong
5cc7648e9c
[Fix] Allow Print Before Pay in POS ( #20151 )
...
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
2019-12-31 17:07:37 +05:30
Saqib
71649fe141
fix: customer credit limit label ( #20152 )
2019-12-31 17:05:34 +05:30
Deepesh Garg
2bc7e2881a
Merge pull request #20149 from nextchamp-saqib/rounded-total-ss
...
feat: added provision to disable rounded total for salary slips
2019-12-31 17:02:14 +05:30
thefalconx33
88de158378
feat: added provision to disable rounded total for salary slips
2019-12-31 15:27:30 +05:30
Saqib
cb7043fd9d
fix: party account currency not fetched from account for SO ( #20146 )
2019-12-31 13:55:13 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d
fix: format currency field in bank and cash payment voucher print format ( #20137 )
2019-12-30 15:18:07 +05:30
rohitwaghchaure
9af557f9d7
fix: incorrect batch fetched for the serialized items ( #20119 )
...
* fix: incorrect batch fetched for the serialized items
* Update stock_controller.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-30 13:26:47 +05:30
Ishan Loya
fe0adc8b25
fix: read WIP warehouse from work order ( #20131 )
...
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked
* fix: remove skip_transfer in stock entry
Related to #10753
2019-12-30 12:19:08 +05:30
rohitwaghchaure
59a835602a
fix: service item's cost showing incorrect amount in stock entry ( #20106 )
2019-12-30 11:42:06 +05:30
Deepesh Garg
e90126f7ab
Merge pull request #20123 from nextchamp-saqib/so-update-items
...
fix: don't allow deletion of items which has work order assigned to it
2019-12-28 21:01:17 +05:30
Deepesh Garg
b914cf0a9d
Merge pull request #19815 from Mangesh-Khairnar/publish-item
...
feat(marketplace): allow user to un-publish item
2019-12-28 17:52:49 +05:30
Deepesh Garg
4f1fcdd4a7
Merge pull request #20125 from marination/stock-module-desk
...
chore: Added Reports to Stock Module Desk
2019-12-28 17:45:06 +05:30
marination
126a63af26
chore: Added Reports to Stock Module Desk
2019-12-27 17:18:27 +05:30
Rohan
901fe4785c
fix: employee preferred email patch ( #20116 )
2019-12-27 17:07:35 +05:30
Ishan Loya
b2a1ae77ce
Remove default BOM filter in Work Order ( #20117 )
...
Not all companies use default BOM (e.g. construction companies, etc.)
2019-12-27 17:06:34 +05:30
Marica
f4fbdf98d1
fix: Removed unneccesary Duplicate Entry Error. ( #20120 )
2019-12-27 16:53:05 +05:30
thefalconx33
2073eeb8fa
fix: don't allow deletion of items which has work order assigned to it
2019-12-27 16:26:03 +05:30
Marica
47ab9850e6
fix: Show both warehouse columns in Stock Entry Grid view. ( #20113 )
2019-12-27 15:31:07 +05:30
Mangesh-Khairnar
c7ce597b7f
fix: return when Hub Tracked Item is empty
2019-12-27 14:48:14 +05:30
Saqib
7e57ede35b
fix: unpaid invoices are created even if current invoice is paid ( #20081 )
2019-12-27 13:02:13 +05:30
Deepesh Garg
467dba1954
fix: Patch incorrect GST category in invoices ( #20084 )
...
* fix: Patch to set GST category for unregistered invoice
* fix: Move patch up in line
2019-12-27 12:58:19 +05:30
Mangesh-Khairnar
cca6fb2794
Merge branch 'develop' into publish-item
2019-12-27 12:55:28 +05:30
rohitwaghchaure
4d806033af
Merge pull request #19335 from PawanMeh/feat_19334
...
feat(regional): Italian Localization and Passive invoicing cycle
2019-12-27 12:48:46 +05:30
rohitwaghchaure
616431d7c3
fix: incorrect reorder level in stock balance report ( #20111 )
2019-12-27 12:35:58 +05:30
Rohan
e944f7ac05
fix: Add Serial No button prompt ( #20099 )
2019-12-27 12:34:36 +05:30
rohitwaghchaure
a99f926a4b
fix: incorrect validation for scrap items ( #20109 )
2019-12-27 12:21:15 +05:30
Nabin Hait
8f3fea63b1
Merge branch 'develop' into publish-item
2019-12-27 12:19:02 +05:30
Saqib
8774c869d7
fix: first name not fetched from job offer applicant name ( #20093 )
2019-12-27 12:15:20 +05:30
Mangesh-Khairnar
8768d5d396
fix: fetch opening accumulated depreciation ( #20095 )
2019-12-27 12:14:46 +05:30
rohitwaghchaure
5b889ef864
Merge pull request #20079 from nabinhait/rounding-adjustment-dev
...
fix: rounding adjustment while both inclusive tax and discount amount present
2019-12-27 11:51:50 +05:30
Deepesh Garg
1a2e4fa36d
Merge pull request #20087 from nextchamp-saqib/pay-reco-fix
...
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-27 08:13:09 +05:30
thefalconx33
61bd6ccc2b
fix: travis failing for leave application test
2019-12-26 18:27:58 +05:30
deepeshgarg007
bd1da65098
fix: Update modified date
2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43
fix: Add against blanket order field in sales order
2019-12-26 18:15:13 +05:30
deepeshgarg007
8857d87c5b
fix: Travis
2019-12-26 17:34:02 +05:30
Deepesh Garg
4ee6e37fc3
Merge pull request #20091 from nextchamp-saqib/account-period
...
fix: only show doctypes which impact accounting in accounting period
2019-12-26 17:18:08 +05:30
Deepesh Garg
3f7a1a736c
Merge pull request #20090 from geniusupgrader/develop
...
fix: fix to issue #20089
2019-12-26 16:06:10 +05:30
thefalconx33
81d0861506
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-26 14:42:11 +05:30
thefalconx33
6291ca8e40
fix: only show doctypes which impact accounting in accounting period
2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
...
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Robin Rosenstock
e6387f9dca
fix to issue #20089
2019-12-26 08:09:47 +00:00
Rohit Waghchaure
2469fb9e35
fix: rounded total issue
2019-12-26 13:26:39 +05:30
Pawan Mehta
6e1ba43c3c
code fixes
2019-12-26 12:14:33 +05:30
Rohit Waghchaure
2c13a0533b
code cleanup
2019-12-26 12:14:32 +05:30
Pawan Mehta
bc40161d08
add ignore mandatory flag
2019-12-26 12:13:27 +05:30
Pawan Mehta
c3bb04ccb8
code improvements
2019-12-26 12:13:27 +05:30
hello@openetech.com
39b54cb889
validation change
2019-12-26 12:13:27 +05:30
hello@openetech.com
e9377e2513
review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
eb87566fa6
log encoding exception
2019-12-26 12:13:27 +05:30
hello@openetech.com
9e0762e8c2
code review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
5b33765a8c
discount handling
2019-12-26 12:13:27 +05:30
hello@openetech.com
90f170c376
code improvement
2019-12-26 12:13:27 +05:30
hello@openetech.com
c8e64235c0
codacy fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
309913bbdf
fix codacy issues
2019-12-26 12:13:27 +05:30
hello@openetech.com
5fadd355df
add naming series option
2019-12-26 12:13:27 +05:30
hello@openetech.com
fa8159efa3
mop options fix
2019-12-26 12:13:27 +05:30
hello@openetech.com
9964ad7870
python 2.7 fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
7021402a45
[feat] #19334
2019-12-26 12:13:27 +05:30
Rohit Waghchaure
682273a00b
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
Mangesh-Khairnar
d19bd8f0dd
Merge branch 'develop' into publish-item
2019-12-25 22:10:33 +05:30
Nabin Hait
a68ebdd008
Merge branch 'develop' into rounding-adjustment-dev
2019-12-25 15:18:12 +05:30
Himanshu
e2ea11c437
fix: remove quote ( #20076 )
2019-12-25 15:15:35 +05:30
Parth J. Kharwar
8c4cf12c93
Setting preferred driver email in delivery trip ( #19832 )
...
* fix: add driver's preferred contact email in delivery trip
* fix: modify driver's preferred email patch and blank field checks
* fix: patch file fix
* fix: patch changes to improve speed
* fix: removal of conflicts
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-25 15:14:52 +05:30
Nabin Hait
f32fc230f7
fix: rounding adjustment while both inclusive tax and discount amount present
2019-12-25 14:01:38 +05:30
rohitwaghchaure
6e8a9286c2
fix: multiple stock entry issues for the work order ( #18686 )
...
* fix: multiple stock entry issues for the work order
* Update work_order.py
* Update work_order.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-24 18:53:32 +05:30
Rohan
7372672044
fix: pull serial numbers linked to batches + pull warehouse correctly (develop) ( #19022 )
...
* fix: pull serial numbers according to set warehouses
* fix: handle purchase returns
2019-12-24 18:19:58 +05:30
DeeMysterio
df3b4e48fe
fix(adress): get the address title at the top and mandatory in display ( #20074 )
2019-12-24 18:10:18 +05:30
Khushal Trivedi
dd42dbc6a3
fix: date validation on student form, instructor duplicate fix on student grp, instructor with same employee id fix ( #20072 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix
* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix
* fix: Exclude current record while validating duplicate employee
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-24 18:07:09 +05:30
Mitchy25
fee8340f98
fix: Bank Reconciliation Allows to Over Reconcile ( #19461 )
...
* Update bank_reconciliation.py
* fix: improve error message while over reconciling
* fix: only check over-reconciliation when against payment entry
Co-authored-by: Saqib <thefalconx33@gmail.com>
2019-12-24 18:02:18 +05:30
Mangesh-Khairnar
0143f7c59d
patch: set published in hub track item
2019-12-24 17:45:57 +05:30
Mangesh-Khairnar
7a5b9a7bbe
fix: translations and route fixes
2019-12-24 17:39:15 +05:30
Don-Leopardo
ec258a43d9
perf: Asset Depreciations and Balances report ( #18022 )
2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3
fix: added validation for cost center ( #19932 )
...
* fix: add validation for cost centers in sales invoice
* use `get_cached_value` for getting compnay, formatting of error message
2019-12-24 16:46:46 +05:30
Deepesh Garg
e0b4d33039
Merge pull request #18715 from Alchez/v12-lead-address-contact
...
feat: create address and contact after lead creation (develop)
2019-12-24 16:46:05 +05:30
deepeshgarg007
d7427919a4
fix: Address section rearrange and minor bug fixes
2019-12-24 16:45:09 +05:30
Saqib
0ad7449ae3
feat: allow adding & deleting of items in submitted SO & PO ( #19911 )
...
* 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-24 16:42:30 +05:30
Don-Leopardo
5557b16260
fix: order_type validation restriction ( #18096 )
2019-12-24 16:39:34 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger
...
feat: drill down on batch transactions (develop)
2019-12-24 15:25:05 +05:30
Deepesh Garg
e633567787
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 14:43:41 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix
...
fix: enable adding of address without enabling checkout feature
2019-12-24 14:08:19 +05:30
rohitwaghchaure
08433c2919
fix: supplier email id field not showing in the notification for purchase cycle doctypes ( #20071 )
2019-12-24 13:03:47 +05:30
Deepesh Garg
58408217f6
Merge pull request #19822 from Mangesh-Khairnar/edit-item-details
...
feat(marketplace): edit item details
2019-12-24 13:02:20 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension
...
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:57:50 +05:30
Deepesh Garg
55bc26e300
fix: Allow creation of multiple landed cost voucher against a Purchase Document ( #20058 )
2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7
fix: ambihious error ( #20068 )
2019-12-24 12:31:38 +05:30
Sun Howwrongbum
088be37e64
feat: consider expiry_date during Batch queries ( #20065 )
2019-12-24 12:29:25 +05:30
RJPvT
818c49279c
Update supplier_scorecard.py ( #20061 )
2019-12-24 12:24:58 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount
2019-12-24 11:51:39 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 11:21:08 +05:30
DeeMysterio
152c6be209
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant ( #20053 )
2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba
Update employee.json ( #20057 )
...
unnecessary description. Should be added by customer manually if needed individually.
2019-12-23 18:50:40 +05:30
Parth J. Kharwar
da5d5c4941
fix(hr): update leave application status on cancel ( #19883 )
2019-12-23 18:41:17 +05:30
Khushal Trivedi
d8c10bcedb
fix:Sibling child table filtering for duplicate entry on student form ( #19908 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
2019-12-23 18:38:11 +05:30
Prssanna Desai
4f72c0b8b5
fix: wrong items in table being deleted ( #19994 )
2019-12-23 18:27:12 +05:30
Marica
93cb64ee30
enhancement`: Added Set Reserve Warehouse field in Purchase Order. ( #19991 )
2019-12-23 18:24:56 +05:30
Pranav Nachnekar
8bada8759a
fix: wrap scheduled_time with getdate() ( #20044 )
...
* fix: wrap `scheduled_time` with `getdate()`
Handles inconsistent data returned from the ORM.
* fix: use `getdate()` instead of `date()`
2019-12-23 18:19:29 +05:30
Anurag Mishra
bd5f5dabbd
fix: Salary Structure Fixes ( #19923 )
2019-12-23 18:01:40 +05:30
Deepesh Garg
2b3482d5dd
fix: Do not validate accounting dimensions if from repost ( #20042 )
...
* 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:50 +05:30
Saqib
c1b6b4ed35
fix: breadcrumb for company list ( #20051 )
2019-12-23 17:28:00 +05:30
Saqib
9078607600
fix: paid amount gets overwritten by get_outstanding_invoices ( #20050 )
2019-12-23 16:25:16 +05:30
Saqib
06f9538e51
fix: bad condition while checking last asset movement entry ( #20047 )
2019-12-23 16:08:21 +05:30
Saqib
4f18d2548d
fix: none type object updates AR report row ( #19958 )
2019-12-23 16:01:38 +05:30
Saqib
1263515a92
fix: exchange rate not fetching correctly ( #20010 )
2019-12-23 15:51:31 +05:30
Anurag Mishra
e6b3da0f59
feat: fixed party and party type in Accrual journal entry ( #20021 )
2019-12-23 15:50:29 +05:30
Mangesh-Khairnar
6edd3580d1
fix(expense-claim): update status ( #20030 )
...
* fix(expense-claim): update status
* fix(expense-claim): compare using grandtotal precision
2019-12-23 15:48:34 +05:30
Deepesh Garg
06e7cf3caa
Merge pull request #20009 from nextchamp-saqib/pi-payable-filter
...
fix: bad credit to filter in purchase invoice
2019-12-23 14:50:56 +05:30
thefalconx33
ee10f2f50d
fix: bad query for debit_to field in sales invoice
2019-12-23 13:07:00 +05:30
Rucha Mahabal
0e83a5754b
fix: remove illustrations from onboarding slides ( #19872 )
...
* fix: remove illustrations from onboarding slides
* fix: change Welcome slide's description
* fix: justify text in slide
2019-12-23 08:24:46 +05:30
Deepesh Garg
704235565e
Merge pull request #20012 from nextchamp-saqib/share-transfer-perm
...
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:23:15 +05:30
Rohit Waghchaure
0dba4345f3
fix: patch
2019-12-20 17:04:39 +05:30
rohitwaghchaure
7e7cad8296
Merge pull request #20005 from 0Pranav/appointment-schedulling
...
fix: multiple issues with appointment schedulling
2019-12-20 15:16:59 +05:30
thefalconx33
7e68f050d9
fix: account manager doesn't have cancel submit perm for share transfer
2019-12-20 14:50:25 +05:30
rohitwaghchaure
0dd7e77615
Merge pull request #19928 from 0Pranav/delete-company-txn-query
...
fix: replace sql with orm query for deleting company communications
2019-12-20 13:47:34 +05:30
rohitwaghchaure
977511e814
Merge pull request #20028 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt_develop
...
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:36:23 +05:30
rohitwaghchaure
9c1d3f2f54
Merge pull request #20024 from deepeshgarg007/gstr_2_report_fix
...
fix: Tax amount not visible for some invoices
2019-12-20 13:34:53 +05:30
Rohit Waghchaure
c2a5f99a38
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:01:02 +05:30
Deepesh Garg
7043bbd19e
Merge pull request #19869 from nextchamp-saqib/website-fix
...
fix: website showing disabled items in list of products
2019-12-20 12:14:12 +05:30
Deepesh Garg
ccea0759cc
Merge pull request #20014 from marination/valuation_rate_company
...
fix: Company None not found in get_valuation_rate
2019-12-20 11:55:57 +05:30
deepeshgarg007
ad9eb9b72c
fix: Tax amount not visible for some invoices
2019-12-19 20:57:40 +05:30
Mangesh-Khairnar
c1a1e7d503
style: formatting changes
2019-12-19 20:11:37 +05:30
Gavin D'souza
1e4ea466d3
style: update/standardize rename_doc usage
2019-12-19 19:07:29 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade
...
fix: Update sales register report
2019-12-19 13:53:15 +05:30
marination
457ca0fe6c
fix: Company None not found in get_valuation_rate
2019-12-19 13:34:29 +05:30
thefalconx33
e9cb561d8d
fix: no role has cancelling permission for share transfer doctype
2019-12-19 13:18:46 +05:30
thefalconx33
9d9a78442e
fix: bad filter query
2019-12-19 13:10:57 +05:30
Deepesh Garg
57f9b758b7
Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation
...
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 11:59:50 +05:30
deepeshgarg007
aba58ba50e
fix: Spacing after commas
2019-12-19 11:02:37 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
0Pranav
e786eea7db
remove comments
2019-12-18 16:25:26 +05:30
0Pranav
5f5c725ef9
add book appointment to the sidebar
2019-12-18 16:21:50 +05:30
0Pranav
0db86204cf
fix : only set price list if it exists for customer
2019-12-18 16:03:40 +05:30
0Pranav
84ae2cc543
fix: defualt timezone not getting selected
2019-12-18 15:47:10 +05:30
0Pranav
5150c69ee6
use open_mapped_doc instead of create_new_doc
2019-12-18 12:16:49 +05:30
Anurag Mishra
1202e64403
fix: Training Event Email Tenplate ( #19652 )
2019-12-18 11:43:16 +05:30
0Pranav
e7aa20ebef
fix: replace sql query by orm in delete_communications and added tests
2019-12-18 11:16:54 +05:30
Ben Knowles
f597ba82ea
fix: task validation error when adding tasks to projects ( #19919 )
...
* fix: task validation error when adding tasks to projects
When adding a task to a project, if the project didn't have an Expected End Date the validation would fail.
This is because passing a None value to getdate() returns today's date, rather than being optional as expected.
* update task.py
2019-12-18 00:37:02 +05:30
deepeshgarg007
be8c406808
fix: Update sales register report
2019-12-17 22:27:23 +05:30
Rohit Waghchaure
4203eb4ee1
fix: not able to make work order from BOM
2019-12-17 18:19:26 +05:30
deepeshgarg007
b695fd31d6
fix: Remove trailing whitespace and add semicolon
2019-12-17 18:14:33 +05:30
deepeshgarg007
e65ada2807
feat: Dynamic filters for dimensions in budget variance report
2019-12-17 17:54:34 +05:30
rohitwaghchaure
5d0c42e2a1
Merge pull request #19943 from nextchamp-saqib/gl-precision-fix
...
fix: gl entries doesn't filter based on debit precision
2019-12-17 17:23:34 +05:30
rohitwaghchaure
3772b2e03e
Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order
...
fix: now allow to over production against work order
2019-12-17 17:16:24 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13
...
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a
fix: incorrect outstanding amount shwoing in the AP/AR report
2019-12-17 12:48:02 +05:30
deepeshgarg007
83ecaefd4c
feat: Custom button to create return entry from Employee Advance
2019-12-17 11:03:22 +05:30
rohitwaghchaure
741f64a51d
Merge pull request #19960 from rohitwaghchaure/fixed_incorrect_child_bom_fecthed_develop
...
fix: incorrect child boms fetched
2019-12-16 17:00:35 +05:30
Rohit Waghchaure
b5bf22a821
fix: now allow to over production against work order
2019-12-16 16:53:00 +05:30
Rohit Waghchaure
197a99ee35
fix: incorrect children boms fetched
2019-12-16 16:20:47 +05:30
rohitwaghchaure
bb75179577
Merge pull request #19957 from nextchamp-saqib/pos-serial-no-fix
...
fix: display serial no selection on adding items to cart
2019-12-16 15:11:51 +05:30
thefalconx33
f195ccd85f
fix: review changes
2019-12-16 15:04:17 +05:30
thefalconx33
e9c9cbd2fe
fix: display serial no selection on adding items to cart
2019-12-16 14:55:16 +05:30
rohitwaghchaure
b500f2ce4c
Merge pull request #19940 from marination/item_manufacturer_table_dev
...
fix: Removed 'manufacturers' table from Item Master
2019-12-16 14:44:49 +05:30
rohitwaghchaure
86b2956ac0
Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount
...
fix: pricing rule not working for product discount
2019-12-16 14:44:22 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
marination
5ab823beab
fix: Removed validation from non existent manufacturers table
2019-12-16 12:19:47 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2
fix: Dashboard for employee advance doctype
2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987
fix: Minor filter fix in expense claim type
2019-12-15 21:20:55 +05:30
Deepesh Garg
b0ab31f69b
Merge pull request #19927 from surajshetty3416/fix-profit-and-loss-statement
...
fix: Profit and Lost (financial statement) report
2019-12-15 20:22:31 +05:30
rohitwaghchaure
5ed8465788
Merge pull request #19945 from nextchamp-saqib/existing-asset-fix
...
fix: remove mandatory purchase reference for existing asset
2019-12-15 16:29:30 +05:30
Suraj Shetty
ba3c9b7651
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 23:36:11 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 22:49:53 +05:30
deepeshgarg007
94ff8058ac
fix: Add missing import
2019-12-14 21:25:30 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix
...
fix: Price rule filtering fix
2019-12-13 16:01:16 +05:30
thefalconx33
5da7e729a5
fix: remove mandatory purchase reference for existing asset
2019-12-13 15:44:39 +05:30
thefalconx33
bfc43d3b15
fix: gl entries doesn't filter based on debit precision
2019-12-13 15:41:19 +05:30
Mangesh-Khairnar
4bea44b9c9
fix: update already existing items
2019-12-13 15:05:43 +05:30
deepeshgarg007
8c9c6ec919
fix: Price rule filtering fix
2019-12-13 13:47:15 +05:30
marination
81990aee9f
fix: Removed 'manufacturers' table from Item Master
2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount
...
fix: Division by zero error in Stock Entry
2019-12-13 09:23:44 +05:30
Himanshu Warekar
c7feea830f
feat: Email Append To
2019-12-12 21:12:17 +05:30
marination
0e33f792d3
fix: Distribute charges based on quantity if Total Basic Amount is Zero.
2019-12-12 16:34:41 +05:30
Deepesh Garg
c9870c88b6
Merge pull request #19930 from deepeshgarg007/regional_address_fix
...
fix: Get regional address details
2019-12-12 16:25:31 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix
...
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:54 +05:30
deepeshgarg007
c58dc873d5
fix: Get regional address details fix
2019-12-12 14:55:57 +05:30
Suraj Shetty
f95267041d
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-12 13:06:17 +05:30
Rohit Waghchaure
9b0d7b93dd
fix: not able to submit the landed cost voucher
2019-12-12 12:10:25 +05:30
Deepesh Garg
60592e9d43
Merge pull request #19897 from hrwX/qms-int-issue
...
fix: rename labels
2019-12-12 08:45:51 +05:30
Deepesh Garg
d10cefa37e
Merge pull request #19893 from marination/rounded_total
...
fix: Disable Rounded Total always showing field default value
2019-12-11 18:40:56 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher
...
fix: not able to cancel the landed cost voucher
2019-12-11 18:38:23 +05:30
thefalconx33
107989316c
fix: additional notes from Quotations not saved in SO
2019-12-11 18:15:54 +05:30
thefalconx33
894c210027
fix: enable address without checkout feature
...
* fix add address form country link field
2019-12-11 17:43:04 +05:30
Mangesh-Khairnar
c6599fd1e2
fix: add publihed in hub track item
2019-12-11 17:29:04 +05:30
thefalconx33
5b622eace1
fix: handle scenario with no condition
2019-12-11 16:08:31 +05:30
0Pranav
d3605d2354
fix: issue in javascript timezones
2019-12-11 15:02:23 +05:30
prssanna
2ef26fbb07
fix: empty fname and fcontent of uploaded file
2019-12-11 14:21:04 +05:30
Rohit Waghchaure
37cf096102
fix: not able to cancel the landed cost voucher
2019-12-11 13:50:29 +05:30
Himanshu Warekar
45e4b73e08
fix: rename fields
2019-12-11 13:07:41 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement
...
fix: Manufacturing UX, added calendar view for job card
2019-12-11 13:01:16 +05:30
marination
ca6dbad7cb
fix: Disable Rounded Total always showing field default value
2019-12-11 12:10:05 +05:30
Raffael Meyer
9e32f587f5
fix: remove contact info, use international format ( #19828 )
...
- for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15
- it is not customary, to use contact information such as phone number in the address
2019-12-10 21:41:05 +05:30
Khushal Trivedi
5380a4c3db
fix-education: date of birth validation on student form ( #19875 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
2019-12-10 21:38:42 +05:30
Anurag Mishra
9046c13858
fix: added extra condition ( #19884 )
2019-12-10 21:37:27 +05:30
Pranav Nachnekar
6aa763221b
fix: rename appointment booking route ( #19886 )
...
* rename appoinment booking route
* fix: replace all references to book-appointment route
2019-12-10 21:35:28 +05:30
rohitwaghchaure
c58495dcee
fix: Item-wise Sales History report not working ( #19889 )
2019-12-10 21:34:03 +05:30
Saqib
664d0d89b5
fix: incorrect account mapping for child companies ( #19887 )
...
* fix: incorrect account mapping for child companies on adding account to parent company
* Update account.py
2019-12-10 21:32:17 +05:30
Mangesh-Khairnar
dd079d7e02
Merge pull request #19885 from Anurag810/leave_application_dashboard_fix
...
fix: removed only custom dashboard
2019-12-10 16:24:51 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* 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: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Anurag Mishra
9cc5c18f36
fix: removed only custom dashboard
2019-12-10 15:20:47 +05:30
Deepesh Garg
ce42f48bfb
fix: Append expense account only if expense account exists ( #19880 )
2019-12-10 12:15:33 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense ( #19807 )
...
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* fix: copy cost center from other row
* patch: set cost center in children based on parent
* fix: test cases for expense claim
2019-12-10 08:40:10 +05:30
marination
214acc9a42
fix: Changed check condition and added test
2019-12-09 21:38:19 +05:30
Mangesh-Khairnar
0cb2783f80
fix: create unpublish log on the hub
2019-12-09 19:24:29 +05:30
Saqib
5998034b02
fix: error message displays asset category as None ( #19873 )
...
* fix: error message displays asset category as None
* fix: asset gl_entries doesn't considers asset category's cwip account
2019-12-09 19:07:05 +05:30
Pranav Nachnekar
ae02b4119d
add init.py for appointment modules ( #19823 )
2019-12-09 19:03:35 +05:30
Nabin Hait
da4847e46d
patch: Set against_blanket_order value in existing SO/PO ( #19810 )
...
* patch: Set against_blanket_order value in existing SO/PO
* Update set_against_blanket_order_in_sales_and_purchase_order.py
2019-12-09 18:27:50 +05:30
Shivam Mishra
9e0b3b29fa
feat: better message for serial number creation ( #19863 )
2019-12-09 18:21:23 +05:30
Deepesh Garg
88c4514024
Merge pull request #19864 from nextchamp-saqib/report-col-fix
...
fix: column data not visible after manual selection of columns
2019-12-09 17:57:12 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
thefalconx33
2944301c87
fix: website showing disabled items in list of products
2019-12-09 16:35:54 +05:30
Mangesh-Khairnar
ba48546678
fix: display new item value
2019-12-09 16:31:14 +05:30
Mangesh-Khairnar
d249d4c947
style: change formatting
2019-12-09 15:44:31 +05:30
Mangesh-Khairnar
4350846f1e
fix(compensatory leave request): Create leave ledger entry on submit/cancel ( #19476 )
...
* fix: allow creation of leave ledger entry
* feat(compensatory-leave-request): create leave ledger entry on submit
* style: add descriptive comments
* test: allow creation of leave period based on company
* fix(leave-allocation): check name of leave allocation for determining overlap
* fix: validate new leaves allocated before updating leave allocation
* test: compensatory leave request creation
* fix: skip leave entries for non expired leave allocation
* test: creation of leave ledger entry on creation of compensatory leave request
* fix: minor changes
* fix: fetch leave approver defined in employee in leave application
* fix: attendance creation and leave balance calculation
* test: create leave period for the compensatory off
* style: add descriptive method name
* test: updation of leave allocation on submit
* fix: remove db_set from compensatory off
2019-12-09 14:27:38 +05:30
Faris Ansari
317bf5a321
feat(marketplace): Add category wise search ( #19760 )
...
feat(marketplace): change route for category wise search
2019-12-09 13:59:30 +05:30
Saqib
39e4f75a76
fix: get outstanding invoices btn working on submitted payment entry ( #19858 )
2019-12-09 13:16:35 +05:30
Deepesh Garg
babc2d1ea4
fix: Consistency in button positions in Sales Order and Purchase Order ( #19833 )
2019-12-09 13:04:44 +05:30
Deepesh Garg
b63101250c
fix: Rounding Adjustment GL entry fix ( #19838 )
...
* fix: Rounding Adjustment GL entry fix
* fix: Spacing in tab
* fix: Comment fix
2019-12-09 13:03:24 +05:30
rohitwaghchaure
d2f64214cc
Merge pull request #19853 from rohitwaghchaure/fixed_production_plan_items_required_to_pull_mr
...
fix: 'NoneType' object is not iterable
2019-12-09 12:31:06 +05:30
Deepesh Garg
da638cd476
fix: NoneType' object has no attribute '__getitem_'_ ( #19859 )
2019-12-09 11:28:31 +05:30
Deepesh Garg
3139fa2866
Merge branch 'develop' into new_invoice_fix
2019-12-07 19:54:21 +05:30
Deepesh Garg
ddc6e42b08
Merge pull request #19836 from deepeshgarg007/gst_1_validation_msg
...
fix: Validation msg fix in GSTR-1 report
2019-12-07 19:52:43 +05:30
Raffael Meyer
af9c5fda9e
rename CoA
2019-12-07 14:22:51 +01:00
Raffael Meyer
05d708b51c
add some missing accounts
...
Aktive Rechnungsabgrenzung
Passive Rechnungsabgrenzung
Kasse
Verblk. aus Lohn und Gehalt
Erlöse
2019-12-07 14:21:22 +01:00
Raffael Meyer
d86cefe1a5
first draft
2019-12-07 13:10:44 +01:00
Rohit Waghchaure
502189913a
fix: 'NoneType' object is not iterable
2019-12-07 14:10:11 +05:30
Rohit Waghchaure
6301874795
fix: timsheet overlap error
2019-12-07 13:20:37 +05:30
Rucha Mahabal
690068142b
feat: Continue Slide and New Illustrations for Onboarding Wizard ( #19813 )
...
* feat: added illustrations for onboarding
* refactor: change help label for supplier
* refactor (breaking): rename Setup Wizard slide to Onboarding Slide
* chore: code cleanup for the old doctype Setup Wizard Slide
* fix: added a 'Continue' type slide
* fix: change text in continue slide
* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
deepeshgarg007
99309229bc
fix: Add missing semicolon
2019-12-06 19:59:54 +05:30
deepeshgarg007
ad53649f41
fix: Validation msg fix in GSTR-1 report
2019-12-06 19:34:49 +05:30
Rohit Waghchaure
8ab8376975
fix: Manufacturing UX, added calendar view for job card
2019-12-06 17:40:09 +05:30
Rohan
05222270e1
Merge branch 'develop' into v12-lead-address-contact
2019-12-06 14:25:30 +05:30
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger
2019-12-06 14:25:00 +05:30
Rohit Waghchaure
d98ed8047a
fix: travis failing
2019-12-06 13:17:56 +05:30
Mangesh-Khairnar
015038236c
fix: update hub item document
2019-12-05 02:10:57 +05:30
Mangesh-Khairnar
6d4f4bef7e
fix(marketplace): autocomplete hub category
2019-12-05 01:01:01 +05:30
Himanshu Warekar
175d604f5f
chore: commonize function
2019-12-04 23:08:51 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch
...
feat: Provision to fetch items from multiple BOMs in Stock Entry
2019-12-04 21:44:47 +05:30
Himanshu Warekar
5e90ad6063
Merge branch 'develop' of https://github.com/frappe/erpnext into new_invoice_fix
2019-12-04 19:01:33 +05:30
Mangesh-Khairnar
e4274cbfa6
fix: change formatting
2019-12-04 17:51:08 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
Mangesh-Khairnar
fa170e3c84
fix(marketplace): add watcher for route change to fetch new items
2019-12-04 15:59:17 +05:30
Pranav Nachnekar
114e0db419
fix: query for finding lost quotation ( #19800 )
...
* fix: query for finding lost quotation
* Update opportunity.py
2019-12-04 15:31:43 +05:30
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person ( #19796 )
2019-12-04 15:30:58 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting ( #19805 )
2019-12-04 15:30:01 +05:30
Mangesh-Khairnar
a830f89a59
feat: add date filter in the fixed asset register ( #19799 )
...
* feat: add date filter in the fixed asset register
* fix: remove function from keyword argument
2019-12-04 13:32:31 +05:30
sahil28297
eb9c3e1c5b
fix(patch): set proper tax_type and proper account ( #19794 )
2019-12-04 12:01:31 +05:30
Khushal Trivedi
51f2131a41
fix: joining and relieving Date can be on same date as valid use case on emoloyee form ( #19798 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* Update employee.py
2019-12-04 11:56:44 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms
...
feat: Receivable / payable summary based on payment terms
2019-12-04 11:25:28 +05:30
thefalconx33
a639f16dc9
fix: column data not visible after manual selection of columns
2019-12-04 09:46:42 +05:30
marination
be88d0f8a3
fix: Custom button conditionally visible in draft condition as well
2019-12-03 18:34:38 +05:30
Shivam Mishra
5128f3bd0f
feat: allow searching from meta fields ( #19711 )
...
* feat: allow searching from meta fields
* feat: remove description in query based on number of items
2019-12-03 17:27:22 +05:30
Saqib
d635bda29b
fix selling setting label for sales order reqd ( #19775 )
2019-12-03 17:05:06 +05:30
Khushal Trivedi
73129e6ac8
fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' ( #19774 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
2019-12-03 17:03:45 +05:30
Nabin Hait
e176c3c1d1
feat: Receivable / payable summary based on payment terms
2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8
fix: Party name field in trial balacne for party report ( #19789 )
2019-12-03 16:31:07 +05:30
rohitwaghchaure
36b60dbbef
Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature
...
fix: capacity planning back
2019-12-03 15:23:06 +05:30
Deepesh Garg
03d1394540
fix: Unable to see parties with negative balance in AR/AP Summary ( #19776 )
2019-12-03 15:12:44 +05:30
Marica
c68a940aac
fix: Item qty cannot be zero in Purchase Receipt ( #19779 )
2019-12-03 12:59:22 +05:30
gavin
728f8d09c8
fix: AttributeError on new Student creation ( #19786 )
2019-12-03 12:54:46 +05:30
Nabin Hait
a0f9db4b83
Update employee.py
2019-12-03 12:51:27 +05:30
Deepesh Garg
b4b90eaaf7
Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation
...
fix(sales-order): allow payment request creation for so that are not billed
2019-12-03 10:42:01 +05:30
Anurag Mishra
de5237fbd5
refactor: Report BOM Sock Calculated ( #19431 )
2019-12-02 17:08:12 +05:30
Rucha Mahabal
2fa204d8be
fix: render_template for subject in Email Campaign ( #19772 )
2019-12-02 16:26:10 +05:30
Anurag Mishra
957a6f5bd5
fix: UX/UI ( #19753 )
2019-12-02 14:44:17 +05:30
rohitwaghchaure
ce32f9a361
Merge branch 'develop' into capacity_planning_for_workstataion_feature
2019-12-02 11:29:06 +05:30
Mangesh-Khairnar
c131bd1b25
feat(marketplace): edit item dialog
2019-12-02 01:09:59 +05:30
deepeshgarg007
f89b172202
fix: Available stock for packing item report
2019-12-01 21:53:32 +05:30
Wolfram Schmidt
5249a6348f
Update de.csv ( #19755 )
...
Changed all translations from "Aufgabe" to "Vorgang" in singular and plural where the word "Task" is project related. Left all agricultural and others how they are (as Aufgabe).
2019-12-01 10:47:21 +05:30
Deepesh Garg
98a54355ae
fix: Post GL entry fix for asset ( #19751 )
2019-12-01 10:06:16 +05:30
Himanshu Warekar
4405a2a5f8
fix: add project in child for items
2019-11-30 16:58:31 +05:30
Mangesh-Khairnar
ad66677029
fix: add conditional message in template string
2019-11-29 23:59:02 +05:30
Gavin D'souza
5e217c698f
Merge branch 'set-request-util' of github.com:gavindsouza/erpnext into set-request-util
2019-11-29 20:30:03 +05:30
Gavin D'souza
23b1dae6a7
chore: dropped dead setup_wizard test
...
fix: fixed imports for teste utils
2019-11-29 20:22:06 +05:30
Nabin Hait
d1b1156b8c
Merge branch 'develop' into set-request-util
2019-11-29 18:49:34 +05:30
Rohit Waghchaure
8c6bc34bc4
added test cases
2019-11-29 18:42:20 +05:30
Victor Munene
b3af2adc4a
use program.courses instead of get_all_children to get course list ( #19695 )
2019-11-29 18:12:13 +05:30
Anurag Mishra
935517d914
fix: added bank reconciliation page in the accounting module ( #19719 )
...
* fix: added bank reconcilation page inaccounting module
* Update accounts.py
2019-11-29 18:08:42 +05:30
Sammish Thundiyil
54694dd816
modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json ( #19470 )
2019-11-29 18:00:30 +05:30
Gavin D'souza
611d2ccd04
chore: updated path for set_request in v13-develop
2019-11-29 17:42:32 +05:30
Anurag Mishra
10017c14f3
feat: HSN Code wise Item Tax ( #19478 )
...
* feat: HSN Code wise Item Tax
* feat: enqueued task of updating all items
2019-11-29 17:33:10 +05:30
Raffael Meyer
0de066c3b1
feat(regional): Add master data to DATEV Export ( #18755 )
...
* Add master data to export
* add SQL statements to get customers and suppliers
* make data category a string
* fix SQL error
* fix SQL errors
* unique column names
* add encoding of constants
* get customer primary address and contact
* fix typo
* fix typo
* binary response
* add filename
* add filecontent
* rename account columns
* exclude account groups
* use compression, close file before transfer
* fix StringIO
* add basic tests
* fix assertion, merge test methods
* fix indentation
* relative import of constants
* fix path
* import os
* Add default currency to test company
* root accounts with parent = null
* move account-related things to setup()
* add: test headers
* company and filters become class properties
* add: test csv creation
* (fix): add missing account
* (fix): remove wrong space
* add items to sales invoice
* refactor: create test data
* fix: create cost center
* fix: doctype Accoutn
* fix: make sure account belongs to company
* fix: remove customer group and territory, save on a new line
* create default warehouses
* fix: make Item myself
* fix: item defaults are a list
* fix: use my own warehouse
* fix: use my own expense account
* fix: let you take care of the Sales Invoice Item
* fix: import zipfile
* add TODOs
* fix: workaround for pandas bug
* SQL: utf-8 everywhere to make conversion in tests unnecessary
* tests: zipfile must be encoded string
* fix(tests): invalid start byte
* fix(test): give is_zipfile() the file-like object it expects
* fix(test): fix encoding of colums
* fix(get_transactions): as_dict is 1 by default
* fix(tests): allow empty data
* refactor: rename columns in get_account_names
* fix(pandas): keep sorting columns
* fix: "lineterminator" must be a string
* fix(test): check if cost center exists
* fix: credit limit became a child table
* fix: save company after creation
* insert instead of save
* tests: setup_fiscal_year
* fix(test): import cstr
* fix(tests): fiscal year
* fix: can't concat str to bytes
* fix: make csv-encoding work for py2 and py3
* fix(test): use frappe.as_unicode instead of unicode
* fix: use BytesIO instead of StringIO for py3 compatibility
* fix(tests): use BytesIO instead of StringIO for py3 compatibility
2019-11-29 17:32:17 +05:30
Prasad Ramesh
750b3a5946
fix: Button label case ( #19706 )
...
Json -> JSON
2019-11-29 17:30:46 +05:30
Khushal Trivedi
e3c05290c8
fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req ( #19691 )
2019-11-29 17:00:09 +05:30
Deepesh Garg
06a6fa4cfc
feat: Accounts Payable report based on payment terms ( #19672 )
2019-11-29 16:56:27 +05:30
Saqib
20c31dd579
fix: tax templates from all companies fetching in receipt ( #19682 )
...
* fix: tax templates from all companies fetching in receipt
* Update purchase_receipt.js
2019-11-29 16:55:10 +05:30
rohitwaghchaure
d76529e6ca
Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix
...
fix: Serial no validation against sales invoice
2019-11-29 16:34:58 +05:30
rohitwaghchaure
c9afe2f707
Merge pull request #19602 from Anurag810/bom-explorer-report-fix
...
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-29 16:18:30 +05:30
deepeshgarg007
c51dd2989e
fix: Validation msg
2019-11-29 15:56:16 +05:30
deepeshgarg007
45f57f273c
fix: Serial no validation against sales invoice
2019-11-29 15:56:08 +05:30
Mangesh-Khairnar
8287c3d05a
feat(marketplace): unpublish item from hub
2019-11-29 15:52:29 +05:30
rohitwaghchaure
b59a25b02b
Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module
...
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:29:31 +05:30
Mangesh-Khairnar
92b9d7383d
fix: show create payment request for so that are not billed
2019-11-29 14:22:52 +05:30
Rohit Waghchaure
bf8fe06f86
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:14:11 +05:30
Rohit Waghchaure
8b599f2bc9
fix: capacity planning back
2019-11-29 14:09:30 +05:30
Suraj Shetty
9d6d95c4a2
fix: valuation of "finished good" item in purchase receipt ( #19268 )
...
* 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 13:26:52 +05:30
Marica
8f48896261
fix: Permission issue in Stock Entry ( #19738 )
2019-11-28 19:39:49 +05:30
Mangesh-Khairnar
2597817cde
fix: add new routes to handle category wise search
2019-11-28 18:57:42 +05:30
Anurag Mishra
f3b393f5e0
fix: UOM was not fetching in purchase invoice ( #19732 )
...
* fix: UOM was not fetching in purchase invoice
* fix: Changes requested
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645
fix: Validation for parent cost center ( #19664 )
...
* fix: Validation for parent cost center
* fix: Minor modification in condition
* fix: Update test cases for invalid cost center creation
2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c
Fix: Logic bug ( #19692 )
...
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
- if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
- should be if accounts[d]['is_group'] not in ('', 0)
However, the correction provided here:
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]
is more consistent with the prior statement that extracts ledger (and not group) accounts.
account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f
fix: Account type in Handling Difference in Inventory account ( #19674 )
...
* fix: Account type in Handling Difference in Inventory account
* fix: Add Stock Adjustment account
* fix: Rename account to stock adjustment
2019-11-28 18:29:33 +05:30
Saqib
707b83940a
fix: due date before posting date for items added to cart yesterday ( #19681 )
2019-11-28 18:27:17 +05:30
Marica
bcd02069ea
fix: Validation for Suppliers in SO to PO ( #19686 )
...
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
2019-11-28 18:23:45 +05:30
Marica
aff678e376
fix: Changed type of column 'serial_no' in Stock Ledger Entry ( #19702 )
2019-11-28 18:20:48 +05:30
Shivam Mishra
2512962f55
fix: handle None case for get_shipping_amount_from_rules ( #19723 )
2019-11-28 16:46:58 +05:30
Marica
f51ccbf5d4
chore: Added Quick Stock Balance to Stock Module ( #19726 )
...
- Also 'Stock Balance Report' button no longer primary button
2019-11-28 16:44:46 +05:30
rohitwaghchaure
1511154aa8
fix: removed stock value and account balance out of sync validation ( #19729 )
...
* fix: revert value out of sync feature
* fix: removed stock value and account balance out of sync validation
2019-11-28 16:43:39 +05:30
marination
236140d94c
fix: Division by zero error in Stock Entry
2019-11-28 16:36:24 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard
...
feat: Slides for Onboading Wizard in ERPNext
2019-11-28 14:35:10 +05:30
Rohan Bansal
c59ac36378
fix: use new Contact schema
2019-11-28 12:25:38 +05:30
Rohan Bansal
fd46fef857
fix: add designation to Lead
2019-11-28 12:23:33 +05:30
Rohan Bansal
69e3868a9d
patch: set title for old leads
2019-11-28 12:23:19 +05:30
Rohan Bansal
75da5af900
fix: set missing values
2019-11-28 12:23:05 +05:30
Rohan Bansal
f9e2bfcc29
fix: conditionally set lead title as organization or person
2019-11-28 12:23:05 +05:30
Rohan Bansal
312210c2b0
feat: create address and contact after lead creation
2019-11-28 12:22:47 +05:30
deepeshgarg007
2fe0c98772
fix: Path for quotation expiry method in hooks
2019-11-28 08:09:47 +05:30
Rohan Bansal
c7cfc726d7
feat: navigate to stock ledger from batch report
2019-11-27 18:23:31 +05:30
Anurag Mishra
707bb2052c
fix: Employee dashboard disappear after switching from leave application form ( #19690 )
2019-11-27 16:27:50 +05:30
Marica
f0e87f7fdd
fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' ( #19693 )
2019-11-27 15:49:41 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard
2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c
fix: moved slide json files to respective modules
2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584
feat: moved slide action functions from onboarding utils to doctypes
2019-11-26 15:22:45 +05:30
Rucha Mahabal
195893db0e
fix: conditionally run old patch for Setup Progress
2019-11-26 15:22:05 +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
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
Mangesh-Khairnar
647331bbd7
feat: add search in category
2019-11-25 13:56:00 +05:30
Rucha Mahabal
7728ae6988
fix: added company letter head slide
2019-11-25 13:23:53 +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
Rucha Mahabal
00677f334e
fix: user progress code cleanup
2019-11-25 11:58:14 +05:30
0Pranav
eefc492ff4
call commit after sql query for schedular job
2019-11-25 10:51:27 +05:30
marination
737d8a1e26
fix: Added comments
2019-11-25 09:42:08 +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
Rucha Mahabal
3cf2c2b3d5
feat: slides for onboarding wizard in ERPNext
2019-11-21 20:47:08 +05:30
Mangesh-Khairnar
1a92eb14ed
fix: Mark attendance from employee attendance tool ( #19627 )
2019-11-21 17:58:18 +05:30
0Pranav
f5112905dc
import make_item method in tests
2019-11-21 13:19:44 +05:30
Rohit Waghchaure
c4e6c42950
fix: e-invoice issue
2019-11-21 11:20:49 +05:30
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
0Pranav
4a28144941
add tests
2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7
remove: unused imports
2019-11-20 15:31:13 +05:30
0Pranav
ae90ea9547
fix:travis errors
2019-11-20 15:24:33 +05:30
marination
e537cda062
fix: Added conditional check for conversion factor
2019-11-20 12:38:58 +05:30
0Pranav
682956543e
fix travis
2019-11-20 11:45:14 +05:30
Rucha Mahabal
45e9dd9c51
fix(Journal Entry): default Cash Entry account not getting fetched
2019-11-20 11:40:38 +05:30
0Pranav
fe2147a496
fix travis
2019-11-20 11:37:49 +05:30
0Pranav
dbde140e46
fix: save method of Appointment Booking Setting
2019-11-20 10:30:41 +05:30
0Pranav
c8e66a0f71
Infer number_of_agents from agent_list in apppointment booking settings
2019-11-20 10:27:59 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix
...
fix: stock qty not displayed in pos
2019-11-19 19:41:25 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order
...
fix: not able to select item in sales order
2019-11-19 19:40:11 +05:30
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
Anurag Mishra
c0d8233a8b
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-18 15:45:53 +05:30
Rohit Waghchaure
39eeac265b
fix: not able to select department in instructor form
2019-11-18 15:20:15 +05:30
Rohit Waghchaure
466702200f
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90
fix: Book valuation expense in specified account rather than expense included in valuation account ( #19590 )
...
* fix: Book valuation expense in specified accout rather than expense included in valuation account
* fix: Remove undefined variable
* fix: Test cases
* fix: Test Case
2019-11-18 12:34:30 +05:30
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
marination
a076bddd83
fix: Show 'Bill of Materials' custom button conditionally
2019-11-15 12:03:06 +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
prssanna
74bbcb539f
fix: Ignore period closing voucher entries in accounts dashboard
2019-11-14 22:47:58 +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
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
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
Gavin D'souza
5a31e22892
chore: frappe.rename_doc update
2019-11-06 17:03:12 +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
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
marination
075f6ea0d5
feat: Provision to fetch items from BOM in Stock Entry
...
Items are populated in child table and amounts are calculated
Warehouse Fields in popup toggle based on Stock Entry Type
2019-11-04 21:58:13 +05:30
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
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
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
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
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
Shivam Mishra
5e14660dda
Merge branch 'develop' into revert-19265-issue_fix
2019-10-27 17:36:08 +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
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
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
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
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
Corrected
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
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
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
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
721c381df3
Merge branch 'develop' into develop
2019-10-20 18:15:58 +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
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
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
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
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
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 f8cebe65f5fe32382aba842f765d263511cbb082.
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
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
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
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
