Nabin Hait
6d61a45f42
Removed default permission from GST doctypes
2017-09-29 10:35:21 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
Nabin Hait
3b04cfc812
minor fix
2017-09-28 18:55:49 +05:30
rohitwaghchaure
0dc3c1b114
Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo
...
[minor] Added batch item in the demo data
2017-09-28 16:07:01 +05:30
schilgod
0f6fff6f0c
item price track_changes default to 1 ( #10958 )
2017-09-28 15:28:59 +05:30
Rushabh Mehta
2b87d100fa
[fix] https://github.com/frappe/erpnext/issues/10956
2017-09-28 15:21:36 +05:30
Rohit Waghchaure
c4ee77a3cc
[minor] Added batch item in the demo data
2017-09-28 15:19:26 +05:30
Sunny
3ec6960478
move Material Request patch to v9
2017-09-28 15:26:20 +08:00
Sunny
33670bba47
fix reorder_item
2017-09-28 15:24:11 +08:00
Sunny
73f1c93cd2
fix ppt code
2017-09-28 15:24:11 +08:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
0d91d3f572
add schedule_date while creating Material Request
2017-09-28 15:23:52 +08:00
Sunny
892ec599d4
[fix] tests
2017-09-28 15:23:09 +08:00
Sunny
65cd9f2284
Add patch to update schedule date of submitted Purchase Orders
2017-09-28 15:23:09 +08:00
Sunny
799d69baba
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
71866e06f3
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
284ceb7abe
Set PO Reqd By Date default in code, to next date
2017-09-28 15:22:49 +08:00
Sunny
65c7a6947a
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
f7a8277d12
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
12cb07ce3c
[fix] test records
2017-09-28 15:22:49 +08:00
Sunny
23a4b09d43
Add Material Request schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:48 +08:00
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
Nabin Hait
ca916a73de
bumped to version 9.0.3
2017-09-28 13:00:48 +06:00
Makarand Bauskar
53e19075d1
[hotfix] fixes and refactored Quoted Item Comparison report ( #10954 )
2017-09-28 12:30:04 +05:30
Rushabh Mehta
a0ba5594f9
[fix] production_order.py via error report
2017-09-28 11:26:24 +05:30
rohitwaghchaure
16645803f9
[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports ( #10872 )
2017-09-28 11:05:03 +05:30
rohitwaghchaure
94799a8b93
[fix] ‘NoneType’ object is not iterable onload of POS ( #10941 )
2017-09-28 10:56:27 +05:30
Nabin Hait
fce14fdcf0
Fixed merge conflict
2017-09-27 17:21:21 +05:30
Nabin Hait
76615c8001
bumped to version 9.0.2
2017-09-27 17:49:55 +06:00
Prateeksha Singh
283922daa2
[fix] Check for stock_qty, else use qty ( #10937 )
2017-09-27 17:12:28 +05:30
rohitwaghchaure
da8de2f0c7
Re-order patch sequence ( #10936 )
2017-09-27 17:11:40 +05:30
Rohit Waghchaure
566a0a05c8
[fix] 'NoneType' object is not iterable while saving quotation
2017-09-27 15:57:48 +05:30
Rushabh Mehta
f702d72c35
[minor] [performance] push hsn code creation after setup ( #10928 )
2017-09-27 15:31:30 +05:30
Nabin Hait
76e1ca35ad
Merge branch 'master' into develop
2017-09-27 13:05:21 +05:30
Nabin Hait
eb686f8b1a
bumped to version 9.0.1
2017-09-27 13:35:20 +06:00
Brown-Harry Boma
d3fa19143d
Properly redirect supplier after quotations submit ( #10903 )
2017-09-27 12:53:38 +05:30
Makarand Bauskar
70eaf2da95
[minor] removed the default precision for the margin_rate_or_amount field ( #10923 )
2017-09-27 12:49:16 +05:30
Rohit Waghchaure
87e994e0a2
[fixed] Disocunt amount not working for POS
2017-09-27 12:16:58 +05:30
rohitwaghchaure
45d45f4247
[hotfix] Wrong calculation of total in taxes and totals ( #10924 )
2017-09-27 11:49:13 +05:30
Prateeksha Singh
946e182564
install company fixtures while creating company ( #10904 )
...
* install company fixtures while creating company
* [fix] remove from setup_complete
2017-09-27 11:44:39 +05:30
Frappe PR Bot
9aff73d156
[Translation] Updated Translations ( #10901 )
2017-09-26 17:18:42 +05:30
Prateeksha Singh
df8fbd7d72
[fix] batch qty checked against stock_qty field ( #10906 )
2017-09-26 17:16:03 +05:30
Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Nabin Hait
c0b4f0e81b
bumped to version 9.0.0
2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f
Set bill no while making payment entry from purchase invoice
2017-09-26 15:56:58 +05:30
rohitwaghchaure
d4c2d77bba
[fix] POS not working if user clicks on back button from form view ( #10912 )
2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1
change log for version 9
2017-09-26 12:41:43 +05:30
Nabin Hait
afe9eabd3c
Merge branch 'master' into develop
2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
9ef023b10f
bumped to version 8.11.6
2017-09-25 17:06:44 +06:00
Nabin Hait
0d0811ca14
reload print style
2017-09-25 16:33:45 +05:30
Nabin Hait
39c2f75e6d
Merge branch 'master' into staging
2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f
Merge branch 'master' into develop
2017-09-25 16:03:31 +05:30
Nabin Hait
7da3c46ef2
bumped to version 8.11.5
2017-09-25 16:33:29 +06:00
Nabin Hait
3b61552836
Revert "Advance against expense claim ( #10632 )" ( #10877 )
...
This reverts commit cdd6ded790
.
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
tundebabzy
e4be3f8dc9
use generator when updating and notify user of long process ( #10777 )
2017-09-21 18:27:33 +05:30
Nabin Hait
cdd6ded790
Advance against expense claim ( #10632 )
...
* Adds Whitelist Method for Advance Entry
* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date
* Adds changes for managing advance payments using Default Account and Party
* Removed console.log from the JS file
* Advance Payment Patch - Fixed Codacy errors
* Removed stray file
* Fixed conflicts due to changes in upstream
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed pending Codacy error
* Updated JS code by removing cur_frm which is soon to be deprecated
* Advance against Expense Claim: cleanup and fixes
* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
Nabin Hait
6d78f7b862
Fixed indentation
2017-09-21 15:51:42 +05:30
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
Nabin Hait
2851dfad99
Set fields in Item Variant Settings which should be copied from template to variant
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
0e28fccb34
[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated
2017-09-21 15:41:57 +05:30
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
rohitwaghchaure
12fd8a6047
[fix] User not able to complete the production order because of decimal issue ( #10868 )
2017-09-21 14:39:10 +05:30
Nabin Hait
24ec3c7dcb
Fixed merge conflict
2017-09-21 12:53:41 +05:30
Prateeksha Singh
705d885b64
[progress] R/W permission for all roles ( #10866 )
2017-09-21 12:02:18 +05:30
Manas Solanki
1c1dd08a34
only validate party account and ref doc party account in selected case ( #10863 )
...
* only validate party account and ref doc party account in selected case
* fix for fee structure test
* fix the assessment result test
2017-09-21 12:01:20 +05:30
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
Nabin Hait
6960a76adc
Fixes related to schools fees
2017-09-19 17:23:03 +05:30
Manas Solanki
0664d6ed8b
real time fee creation status via socketio
2017-09-19 17:23:03 +05:30
Manas Solanki
1bcc6c661a
minor changes
2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32
add the fee schedule in config
2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85
cleanup of the fee module
2017-09-19 17:23:03 +05:30
Manas Solanki
8c88af23ef
added the test case for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
d1d2633658
removed the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb
fixes as per the review
2017-09-19 17:23:03 +05:30
Manas Solanki
49c52f7639
renamed one doctype to the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79
make payment entry for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5
make gl_entry on submission of fees
2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5
make payment request for the fee
2017-09-19 17:23:02 +05:30
Manas Solanki
f073814635
added fee request doctype
2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
Nabin Hait
caf9891075
Fixed merge conflict
2017-09-19 12:06:22 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
Nabin Hait
703e837125
bumped to version 8.11.4
2017-09-19 12:35:39 +06:00
rohitwaghchaure
4f0f144142
Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop
...
Cherry pick staging to develop for subscription cleanup
2017-09-19 10:26:20 +05:30
Nabin Hait
cf36534eed
Gross profit report considering returned items ( #10734 )
2017-09-18 19:13:45 +05:30
AravindPranera
cb6774e373
Files added with all functions
2017-09-18 17:37:37 +05:30
AravindPranera
1276893550
Files added with all functions
2017-09-18 17:30:20 +05:30
rohitwaghchaure
d02744b436
[fix] Subscription patch ( #10827 )
2017-09-18 17:23:00 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Nabin Hait
e859671eb3
Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )" ( #10830 )
...
This reverts commit d258372f9e
.
2017-09-18 17:22:46 +05:30
Neil Trini Lasrado
d258372f9e
Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )
2017-09-18 17:12:16 +05:30
tundebabzy
f6d738b3c5
Delivery note to billing issue ( #10726 ) ( #10766 )
...
* allow invoices to be made from sales returns
* Update queries.py
2017-09-18 17:10:09 +05:30
Utkarsh Goswami
b98359f4a7
Payment entry ( #10668 )
2017-09-18 17:06:13 +05:30
Makarand Bauskar
5c1d15f015
[change-log] added change log for v9.0.0 ( #10756 )
...
* [change-log] added change log for v9.0.0
* Update v9_0_0.md
2017-09-18 17:03:21 +05:30
Manas Solanki
a22c94c246
refactored assessment result tool ( #10633 )
...
* save the assessment instead of submit
* Added comments in the artool
* remove the cur_frm and message for submitted result
* link field for the assessment result
2017-09-18 16:59:54 +05:30
Faris Ansari
aebcb17daf
Show thumbnail image in daily work summary ( #10605 )
...
* Show thumbnail image in daily work summary
* Crop thumbnail image into square
* fix codacy
2017-09-18 16:58:24 +05:30
rohitwaghchaure
6cea73b834
[fix] Subscription patch ( #10827 )
2017-09-18 16:58:05 +05:30
Utkarsh Goswami
bd0beb6c02
[fix] unknown column in production order ( #10828 )
2017-09-18 16:48:45 +05:30
Utkarsh Goswami
e78d5a240a
[fix] unknown column in production order ( #10828 )
2017-09-18 16:44:11 +05:30
Neil Trini Lasrado
de3429280b
Made Template link in variant (Item Master) intro linkable ( #10696 )
...
* Made Template link in variant (Item Master) intro linkable
* Update item.js
2017-09-18 16:42:10 +05:30
Neil Trini Lasrado
8c9f2a1be6
Add communication entry to Sales Order only if payment entry email is sent to customer ( #10716 )
2017-09-18 16:41:49 +05:30
Prateeksha Singh
9b4f3cf9de
Leaderboard cleanup ( #10638 )
...
* [leaderboard] wip
* [leaderboard] filter for selecting leaderboard criteria, single col
* [leaderboard] doctypes in sidebar
* hide graph if no results
2017-09-18 16:41:04 +05:30
Saurabh
9c334c34a6
[fix]remove employee field from tab salary structure
2017-09-18 16:17:13 +05:30
Manas Solanki
e716da04ec
add the newsletter in the standard portel ( #10784 )
2017-09-18 16:00:34 +05:30
Saurabh
590d401e5f
[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt ( #10793 )
...
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt
* Update bom.js
* Update stock_entry.py
2017-09-18 15:49:19 +05:30
ci2014
9bc197cfd5
Update project.js ( #10796 )
...
* Update project.js
Move indicators to setup to be less buggy
* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Saurabh
d7e1869a70
[fix] if item code not exists then exclude item in validate_selling_price ( #10800 )
2017-09-18 15:43:35 +05:30
Saurabh
3f15bf9828
[fix] query fix for match conditions ( #10810 )
2017-09-18 15:27:24 +05:30
Nabin Hait
9744aa21af
Minor fix in tax rule
2017-09-18 15:25:33 +05:30
Adam Dawoodjee
91eda6dad4
Update creating-custom-link-field.md ( #10822 )
...
Grammer improvements
2017-09-18 15:11:57 +05:30
Zarrar
8f957ef6e6
fetching data from last route ( #10816 )
2017-09-18 15:11:20 +05:30
Utkarsh Goswami
11bd5fc3b1
Description moved next to item code ( #10820 )
2017-09-18 15:05:50 +05:30
Saurabh
2222f10720
[patch] remove employee name salary structure ( #10817 )
...
* [patch] remove employee name salary structure
* Update remove_employee_from_salary_structure_parent.py
2017-09-18 15:05:18 +05:30
Nabin Hait
bc9006ff30
Delete GST related doctypes and reports if account is from outside India ( #10808 )
2017-09-18 13:16:04 +05:30
rohitwaghchaure
70ef09aa8f
Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue
...
[fix] Test cases for tax rule
2017-09-16 22:55:16 +05:30
Rohit Waghchaure
2cb2064c6f
Fixed test cases tax rule
2017-09-15 23:10:27 +05:30
Nabin Hait
21617da619
More fixes for UI tests
2017-09-15 21:22:16 +05:30
Nabin Hait
628ca2a2ec
Minor fix for ui tests
2017-09-15 19:35:12 +05:30
Nabin Hait
46941e8b35
Time out increased for appraisal template
2017-09-15 18:56:49 +05:30
Prateeksha Singh
d1ce7bfff4
[fix] set item valuation rates ( #10681 )
2017-09-15 16:17:29 +05:30
rohitwaghchaure
dd092e30fb
Move subscription module to accounts ( #10772 )
2017-09-15 16:16:36 +05:30
Makarand Bauskar
5ac01a2bf7
[minor] translate the action name in get_slide_settings ( #10740 ) ( #10790 )
2017-09-15 12:10:29 +05:30
AravindPranera
27bbb561d2
removed whitespace
2017-09-15 11:04:14 +05:30
AravindPranera
2c1f44ecfa
Trailing space removed in line 275
2017-09-15 10:57:23 +05:30
AravindPranera
c73383c34c
Trailing whitespace in Line 207 and 276
2017-09-15 10:34:21 +05:30
Nabin Hait
43268bd350
Fixed salary structure tests
2017-09-14 19:39:10 +05:30
Nabin Hait
2f64f0f5fa
Fixed salary structure tests
2017-09-14 19:08:15 +05:30
Nabin Hait
427172c941
Update test_salary_structure.js
2017-09-14 17:57:21 +05:30
Nabin Hait
41146657de
Set default customer group and territory after install
2017-09-14 17:26:23 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
mbauskar
f41cff27e6
resolved merge conflicts
2017-09-14 15:32:55 +05:30
mbauskar
ea832b8157
resolved merge conflicts
2017-09-14 15:32:10 +05:30
mbauskar
8ea3bb0d90
bumped to version 8.11.3
2017-09-14 15:58:44 +06:00
Nabin Hait
45dce89cae
Print Settings for printing taxes with zero amount ( #10782 )
...
* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9
2017-09-14 15:17:38 +05:30
Rushabh Mehta
bf8e331135
[fix] unset default customer group ( #10689 )
...
* [fix] unset default customer group
* added __init__.py file for patch v8.9 directory
2017-09-14 15:03:45 +05:30
Nabin Hait
a6d78ef842
Added Supplier Bill Date in Itemised Purchase Register ( #10783 )
2017-09-14 15:01:04 +05:30
Nabin Hait
77b225e021
Fetch BOM items in Production Order in the same order as BOM
2017-09-14 13:22:45 +05:30
Nabin Hait
3f583b6dd2
Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items
2017-09-14 12:59:31 +05:30
Vishal Dhayagude
d3e22ac09e
[UI Test] Modified Sales Order UI Test ( #10770 )
...
* [UI Test] Modified Sales Order UI Test
* [fix] Codacy fixed
2017-09-14 12:51:22 +05:30
Nabin Hait
f6b132f78e
Update test_quotation.js
2017-09-14 11:55:31 +05:30
Nabin Hait
c7c141a5a0
Update test_setup_wizard.py
2017-09-14 11:51:43 +05:30
rohitwaghchaure
f8458ed9e4
Merge pull request #10771 from nabinhait/pro_order_99
...
Update actual dates in Production Order from Timesheet
2017-09-14 10:53:48 +05:30
rohitwaghchaure
9a0db392de
[Fix] Only typed keywords displying in the field on selection of customer ( #10778 )
2017-09-14 10:51:21 +05:30
Nabin Hait
92309afea1
Update test_setup_wizard.py
2017-09-13 22:37:14 +05:30
Prateeksha Singh
242218d2b7
Progress fixes ( #10710 )
...
* [progress] sales target slide
* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
Nabin Hait
c443c9f05d
Update actual dates in Production Order from Timesheet
2017-09-13 15:14:40 +05:30
Nabin Hait
78baebfe0d
Setup wizard test fix
2017-09-13 15:12:45 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
Nabin Hait
ff667695ad
timeout in setup wizard test
2017-09-13 11:26:55 +05:30
Rushabh Mehta
f849915c13
[fix] label
2017-09-13 10:48:53 +05:30
Nabin Hait
231c324589
Merge branch 'master' into staging
2017-09-12 16:26:31 +05:30
Nabin Hait
f8f29677fd
Merge branch 'master' into develop
2017-09-12 16:16:57 +05:30
Nabin Hait
e47bd4f477
bumped to version 8.11.2
2017-09-12 16:46:55 +06:00
rohitwaghchaure
67dfd26639
[fix] Production planning tool, unable to download material required report ( #10704 )
2017-09-12 15:54:27 +05:30
rohitwaghchaure
54099e592e
[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no ( #10736 )
2017-09-12 15:51:52 +05:30
Manas Solanki
580f39a12c
check the instructor table before querying ( #10754 )
2017-09-12 15:49:36 +05:30
Nabin Hait
c9e96c15af
Rate and amount in a single row in tax breakup
2017-09-12 15:45:49 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +05:30
rohitwaghchaure
38830e54d8
[fix] No module namd student_batch_name.student_batch_name error in the patch ( #10745 )
2017-09-12 11:25:02 +05:30
Rohit Waghchaure
1a77922e85
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-12 11:01:48 +05:30
Makarand Bauskar
d0823adf42
[minor] translate the action name in get_slide_settings ( #10740 )
2017-09-12 10:52:24 +05:30
rohitwaghchaure
80b902cea6
Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings
...
Rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 22:36:38 +05:30
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16
Merge pull request #10737 from nabinhait/budget_variance_for_project
...
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310
[Translation] Updated Translations ( #10741 )
2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f
Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
...
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
Nabin Hait
509bca36b1
Reverse charge in gst print format
2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6
Merge branch 'master' into staging
2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
mbauskar
438088f69d
bumped to version 8.11.1
2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
Faris Ansari
425f1df799
[fix] Tax area alignment ( #10690 )
2017-09-08 15:56:34 +05:30
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
Rohit Waghchaure
06b22e9ac1
[Fix] Customer search optimization for the offline POS
2017-09-07 17:44:42 +05:30
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Vishal Dhayagude
c79d14190f
[fix] travis failed ( #10702 )
2017-09-07 16:05:41 +05:30
Rushabh Mehta
2e8e5354e9
[fix] trainig_feedback.py
2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633
[rename] /test_training_event_attendance.js
2017-09-07 09:07:15 +05:30
Rushabh Mehta
134d59949a
[minor] update warehouse_group in item.reorder_levels
2017-09-07 09:04:24 +05:30
Prateeksha Singh
2697e332f3
[fix] wizard UI test order ( #10663 )
...
* [fix] wizard ui test order
* [setup] remove old test
* [fix] commit to remove lock from defaults table during setup
2017-09-07 09:03:16 +05:30
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
rohitwaghchaure
ec46e51ed4
Merge pull request #10426 from nabinhait/payment_entry_deductions
...
Unallocated and difference amount calculation in Payment Entry
2017-09-06 13:04:25 +05:30
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
rohitwaghchaure
914fd197fc
Update test_payment_against_invoice.js
2017-09-06 12:42:58 +05:30
Faris Ansari
8868ae22be
[fix] Tax area alignment ( #10690 )
2017-09-06 12:17:12 +05:30
Nabin Hait
ded8d11728
Js tests added for write off difference amount
2017-09-06 12:11:48 +05:30
Nabin Hait
6c3618be37
Unallocated and difference amount calculation in Payment Entry
2017-09-06 12:10:52 +05:30
Rushabh Mehta
6ef741554c
[fix] [patch] rename_company_sales_target_field.py
2017-09-06 10:53:26 +05:30
mbauskar
668d04548a
Merge branch 'master' into develop
2017-09-05 20:45:00 +05:30
mbauskar
d4316f0264
bumped to version 8.11.0
2017-09-05 21:14:58 +06:00
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
Nabin Hait
799619b6b0
Fixed multiple uom in selling
2017-09-05 15:52:12 +05:30
Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97
Company Dashboard Title Translatable ( #10673 )
2017-09-05 15:09:35 +05:30
creamdory
05885ca184
Sorting in Production Order BOM Items
2017-09-05 17:02:54 +08:00
Rohit Waghchaure
2967d7ed01
Merge branch 'bom_currency' into develop
2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76
update rate based on uom conversion factor
2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf
[Translation] Updated Translations ( #10669 )
2017-09-05 09:19:06 +05:30
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
mbauskar
7faac85fff
Merge branch 'master' into staging
2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
mbauskar
11cf44986b
bumped to version 8.10.2
2017-09-04 15:20:30 +06:00
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Makarand Bauskar
cf9e986f82
[hotfix] fixed the invalid variable name lead.name ( #10648 )
2017-09-04 10:25:37 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928
Help pages for Attendance ( #10634 )
...
* Help pages for Schools setup
* Documentation of Schools module
* Help pages for Student
* Help pages for Student
* Help pages for Schools Student and Admission Module
* Documentation for Schools Attendance
2017-09-04 10:17:18 +05:30
Saurabh
21833413b0
[fix] ERPNext signup link fix on demo page ( #10649 )
2017-09-04 10:15:24 +05:30
Francisco Roldán
11355cd3c9
Set at lost translated in quotation ( #10652 )
2017-09-04 10:14:58 +05:30
Nabin Hait
baacf51a00
Fixed merge conflict
2017-09-04 10:13:29 +05:30
Zarrar
85eeafdccc
added filter for grading scale selection ( #10639 )
2017-09-01 21:45:10 +05:30
Makarand Bauskar
d6922b2de3
[hotfix] lead name should available before creating new customer from quotations ( #10642 )
2017-09-01 18:45:40 +05:30
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
Umair Sayed
f1881065a8
Merging Help Articles (Q & A) into Manual (Part 2) ( #10629 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
Rushabh Mehta
fc1c00716c
[test] test_account.js - more timeout?
2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00
[test] test_account.js
2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6
[test] test_account.js
2017-09-01 11:46:11 +05:30
Nabin Hait
a9c9b69c22
Change actual charges based on exchange rate ( #10619 )
...
* Change actual charges based on exchange rate
* Update transaction.js
2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244
[Translation] Updated Translations ( #10628 )
2017-08-31 19:38:41 +05:30
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
Saurabh
60739847ab
[minor][fix] change price field type from float to currency ( #10626 )
2017-08-31 17:08:30 +05:30
mbauskar
9012a9b414
Merge branch 'master' into staging
2017-08-31 15:31:48 +05:30
mbauskar
2965f92be3
Merge branch 'master' into develop
2017-08-31 15:31:47 +05:30
mbauskar
2a4328b4f5
bumped to version 8.10.1
2017-08-31 16:01:47 +06:00
Nabin Hait
d7ff9dca1d
Fixed rounding issue in Process Payroll, fixes #9300 ( #10586 )
2017-08-31 15:17:01 +05:30
Nabin Hait
e7e29b7f10
GST print format for POS ( #10590 )
...
* Serial no added in GST tax invoice
* GST print format for POS
2017-08-31 15:06:12 +05:30
Umair Sayed
84be137b4e
Migrating Help Articles (Q&A format) into User Manual ( #10608 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
2017-08-31 14:53:47 +05:30
Vishal Dhayagude
1252c30edf
[UI Test] UI test for Repack and Sales Invoice with Serialize item Added ( #10583 )
...
* [UI Test] UI test for Repack and Sales Invoice with Serialize item Added
* [Fix] Fixed path for sales invoice"
2017-08-31 14:47:56 +05:30
Vishal Dhayagude
1458d7fea6
[UI Test] Stock Entry for material issue with serialize item ( #10592 )
2017-08-31 14:47:01 +05:30
tundebabzy
7f8a259beb
Fixer Always Fetches Latest Exchange Rate Even When Date is Specified ( #10596 ) ( #10597 )
...
* test that confirms the bug. Same test should pass after fix
* make use of correct api url
2017-08-31 14:30:15 +05:30
rohitwaghchaure
56e31d05e9
[Fix] POS customer field is hang while searching customer, make error log if sync has failed ( #10607 )
2017-08-31 14:19:58 +05:30
krnkris
3c635e219e
Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json ( #10601 )
2017-08-31 14:17:46 +05:30
Makarand Bauskar
de278635a3
[hotfix] fixes for UnicodeDecodeError ( #10620 )
2017-08-31 13:36:56 +05:30
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
Faris Ansari
6163a397df
Disable eslint in lib
2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec
Merge branch 'master' into hotfix
2017-08-29 20:42:06 +05:30
mbauskar
a896e52489
resolved merge conflicts
2017-08-29 20:41:59 +05:30
mbauskar
c0f34f454b
bumped to version 8.10.0
2017-08-29 21:08:21 +06:00
Rohit Waghchaure
70aaff46be
minor fix in item group search
2017-08-29 19:19:58 +05:30
tundebabzy
1a947dbf6a
Item Name not loaded in Material Request via BOM ( #10535 ) ( #10555 )
...
* adds item_name to child table
* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table
* removes empty first row after getting from BOM
* ui test
2017-08-29 18:18:27 +05:30
Faris Ansari
c70bbacd34
Add online, offline option, fix search
2017-08-29 15:27:17 +05:30
Faris Ansari
655f86d5e2
UI fixes
2017-08-29 14:27:01 +05:30
Faris Ansari
b9939a6449
Merge pull request #10448 from joelios/selfpostback
...
improvement for self-postbacks
2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2
handle both cases
2017-08-29 14:02:49 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Faris Ansari
847f9f80c1
Merge pull request #10559 from mntechnique/pos_scanner_hotfix
...
[Fix] POS Scanner
2017-08-28 16:54:01 +05:30
Vishal Dhayagude
7ed4bfe7ee
[UI Test] UI Test for Material Receipt with Serialize Item Added ( #10565 )
...
* [UI Test] UI Test for Material Receipt with Serialize Item Added
* [fix]Codacy fixed
2017-08-28 16:53:25 +05:30
Faris Ansari
8fbc08f91f
Decrease timeout to 400
2017-08-28 16:52:20 +05:30
Vishal Dhayagude
872bebbbf8
[UI Test] Stock Entry for Subcontract ( #10574 )
2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996
[UI Test] Stock Entry for Material Transfer to Manufacture ( #10572 )
2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab
resolved merged conflicts
2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
mbauskar
d44af40de8
bumped to version 8.9.2
2017-08-28 12:26:17 +06:00
Nabin Hait
2df0788c11
Validate for negative outstanding reference only if party is Customer or Supplier ( #10568 )
2017-08-28 11:23:33 +05:30
Vishal Dhayagude
914b8463b7
[UI Test] UI Test for Payment Request Added: ( #10553 )
2017-08-28 11:14:28 +05:30
Utkarsh Goswami
7ba2a83182
Tests for Loan ( #10557 )
2017-08-28 11:13:16 +05:30
Vishal Dhayagude
554cf9be44
[UI Test] UI Test Added for Bank Reconciliation ( #10563 )
2017-08-28 11:11:36 +05:30
Vishal Dhayagude
da2164373c
[UI Test] UI Test added for Batch ( #10564 )
2017-08-28 11:10:26 +05:30
Vishal Dhayagude
c3a2204653
[UI Test] UI Test for Sales Order Cancel, amend and save ( #10570 )
2017-08-28 11:09:35 +05:30
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Revant Nandgaonkar
2558daf6b7
Allow search without keypress enter
2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0
[Fix] POS Scanner
...
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
Zarrar
7dc113e977
instructor-naming ( #10550 )
2017-08-25 17:48:36 +05:30
Utkarsh Goswami
579c8e68f9
Tests for Expense Claims [HR] ( #10514 )
2017-08-25 16:12:49 +05:30
Ashwini Save
e33a1e0515
Hide "Help Article" button for timeline Communication type "Comment". ( #10541 )
2017-08-25 12:44:33 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Utkarsh Goswami
9a04da27b0
Test for training ( #10545 )
2017-08-25 12:01:04 +05:30
AravindPranera
764bb30d2d
Fetching Opportunity items into Request for Quotation
2017-08-24 18:34:45 +05:30
AravindPranera
6544a85f1e
Opportunity Items fetching into Request for quotation
2017-08-24 18:32:40 +05:30
Manas Solanki
8de7c0245c
Fixes in the naming series ( #10480 )
...
* rewrite the js
* fix the space issue in the naming series
2017-08-24 17:51:23 +05:30
Vishal Dhayagude
17b2720f5b
[UI Test] UI Test for Payment Entry ( #10521 )
2017-08-24 17:50:28 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
Zarrar
1010a2a2a4
Resolving some issues in school [ issue no:- #10464 ] ( #10529 )
...
* guardian_name issue fix
* guardian table issue resolved
* resolved fetching issue + unnecessary code removed
2017-08-24 16:22:06 +05:30
Utkarsh Goswami
3da5574d79
Test for appraisal ( #10525 )
2017-08-24 15:48:57 +05:30
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Rushabh Mehta
7e506af0b9
[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 ( #10538 )
2017-08-24 15:23:33 +05:30
Rushabh Mehta
72fa958f2c
[layout] lead and opportunity ( #10487 )
2017-08-23 18:47:57 +05:30
Vishal Dhayagude
641d88fd6b
[UI Test] UI Test added for Journal Entry ( #10512 )
...
* [UI Test] UI Test added for Journal Entry
* [mod] Edited date in journal Entry
* [fix] Codacy fixed
2017-08-23 18:32:12 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Rushabh Mehta
4a546e6c18
[minor] delivery note standard filter
2017-08-23 16:16:43 +05:30
Makarand Bauskar
dd8c0febd5
[minor] changed the modified date for bom for rename_bom_update_tool patch ( #10509 )
2017-08-23 13:17:37 +05:30
Faris Ansari
26df5b8c00
Connect Numpad events with POSCart
2017-08-23 13:12:12 +05:30
mbauskar
06f5ae0e78
Merge branch 'master' into develop
2017-08-23 13:06:43 +05:30
mbauskar
918f029d98
bumped to version 8.9.1
2017-08-23 13:36:43 +06:00
Nabin Hait
cb40bd86f8
Supplier bill no in GST itemised purchase register ( #10513 )
2017-08-23 13:04:50 +05:30
Rohit Waghchaure
b73321c577
Item search refactor
2017-08-23 12:15:10 +05:30
Saurabh
b903c86076
Merge pull request #10506 from nabinhait/hotfix677
...
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902
Minor fix in itemised sales register
2017-08-23 09:44:33 +05:30
mbauskar
b69ec059fe
Merge branch 'master' into develop
2017-08-22 20:22:24 +05:30
mbauskar
d46a9572af
bumped to version 8.9.0
2017-08-22 20:52:24 +06:00
rohitwaghchaure
7379e4e5de
Merge pull request #10195 from nabinhait/auto_update_bom_cost
...
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 19:14:53 +05:30
Nabin Hait
bb326f2bbd
Chart of accounts for Taiwan ( #10435 )
2017-08-22 19:07:42 +05:30
Nabin Hait
34c218b2de
Minor improvements based on skip_transfer ( #10457 )
2017-08-22 19:07:16 +05:30
Nabin Hait
382f5eb1b1
Run sales/purchase register for one month by default ( #10493 )
2017-08-22 19:06:21 +05:30
Doridel Cahanap
a6a93cbe06
[Fix] Request for Quotation Portal Title ( #10489 )
2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343
[UI Test] UI test for Sales Invoice with Payment Entry ( #10483 )
...
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593
Travis fix for purchase order receipt ( #10498 )
2017-08-22 17:39:06 +05:30
mbauskar
4396a0e9a8
Merge branch 'master' into staging
2017-08-22 15:42:10 +05:30
mbauskar
3b3ab4d574
Merge branch 'master' into develop
2017-08-22 15:42:10 +05:30
mbauskar
974cfd2895
bumped to version 8.8.6
2017-08-22 16:12:09 +06:00
rohitwaghchaure
187cea3602
[Fix] Accepting duplicate serial no is purchase receipt ( #10469 )
...
* [Fix] Accepting duplicate serial no is purchase receipt
* Fixed test cases
2017-08-22 15:38:32 +05:30
Nabin Hait
28d8557905
[fix] Taxes in itemised purchase register ( #10494 )
2017-08-22 15:30:45 +05:30
mbauskar
7716a08b5d
Merge branch 'master' into staging
2017-08-22 12:03:47 +05:30
mbauskar
7d9452f4e4
Merge branch 'master' into develop
2017-08-22 12:03:47 +05:30
mbauskar
4cbd43cb40
bumped to version 8.8.5
2017-08-22 12:33:46 +06:00
Makarand Bauskar
11224eaf06
[hotfix] fixes for TypeError: 'NoneType' object is not iterable ( #10484 )
2017-08-22 12:03:02 +05:30
rohitwaghchaure
02bad86037
Merge pull request #10473 from rohitwaghchaure/item_group_issue_in_pos
...
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-22 11:34:49 +05:30
Nabin Hait
6c6e45157b
Fixed test case for replace bom
2017-08-22 10:49:58 +05:30
Nabin Hait
52cc08dd2d
Test case added for replacing BOM
2017-08-22 10:49:57 +05:30
Nabin Hait
adbf8adfb9
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 10:49:57 +05:30
Makarand Bauskar
a591d1df5f
[minor] ingore user permission for old_parent fields ( #10471 )
2017-08-21 19:04:49 +05:30
Rohit Waghchaure
33326fe90e
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-21 16:30:21 +05:30
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
Ameya Shenoy
c87c1dbbbf
converted production tests to INR from USD ( #10472 )
2017-08-21 14:10:04 +05:30
Rushabh Mehta
575ab3ab70
[docs] for print style ( #10452 )
2017-08-21 12:24:28 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
mbauskar
ddb26d02e5
bumped to version 8.8.4
2017-08-21 09:27:32 +06:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Zarrar
196b491ac4
[ui test ] Travis failing fix ( #10468 )
...
* Value in assertion was wrong
* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
Nabin Hait
1f49f511aa
Tax rate in Itemised sales/purchase register and cleanups ( #10439 )
2017-08-21 08:05:12 +05:30
rohitwaghchaure
0d9ab86496
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa ( #10453 )
2017-08-21 07:52:49 +05:30
rohitwaghchaure
6b1624cfee
[Fix] Tax rule is not working for the parent customer groups ( #10458 )
2017-08-21 07:38:37 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Makarand Bauskar
80d06da978
[hotfix] fixed mysql syntax error in Student and Guardian Contact Details report ( #10450 )
2017-08-21 07:34:45 +05:30
KanchanChauhan
dd351c585a
[Minor] Title added to rfq web view ( #10454 )
2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Vishal Dhayagude
592e8c2e77
[UI Test] UI Test added for Stock Reconciliation ( #10432 )
...
* [UI Test] UI Test added for Stock Reconciliation
* [fix] Codacy
2017-08-18 15:01:20 +05:30