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
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
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
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
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
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
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
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
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
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
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
