Javier Wong
bf37995745
[Enhancement] Sales and Purchase Default UOM ( #10929 )
...
Option for specifying an optional default Sales and Purchase UOM at the item master level.
2017-09-29 15:23:08 +05:30
tundebabzy
5510d0751d
correctly set frm company currency ( #10944 )
2017-09-29 15:21:59 +05:30
Shreya Shah
b79c4a9ff6
Getting last purchase price of an item ( #10897 )
...
* Added a column last purchase rate
* Removed button last purchase rate
* Get last purchase rate on adding an item
* Added test case for last purchase rate
* Replaced cur_frm with frm
* Update purchase_order.js
2017-09-29 15:20:48 +05:30
Francisco Roldán
1b61dfd9ea
translated ( #10886 )
2017-09-29 15:19:12 +05:30
Shridhar Patil
3f7d96ecba
Unassign from todo. ( #10896 )
...
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Faris Ansari
367b90e3ae
Add Data Import Tool desktop icon ( #10916 )
...
fixes #8332
2017-09-29 15:17:48 +05:30
tunde
25275077ab
Merge branch 'develop' into payment-terms
2017-09-29 10:47:01 +01:00
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Makarand Bauskar
9c339145b2
[Enhance] Custom notification messages for subscription documents ( #10970 )
...
* [minor] configurable subscription email message and subject for notification
* [minor] added description for subject field
2017-09-29 15:02:51 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
Rushabh Mehta
3c14c5a16c
[fix] tax_rule.py args
2017-09-29 13:21:22 +05:30
Nabin Hait
bdb4c542e7
default permission from GST doctypes
2017-09-29 10:39:32 +05:30
Nabin Hait
6d61a45f42
Removed default permission from GST doctypes
2017-09-29 10:35:21 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
Nabin Hait
3b04cfc812
minor fix
2017-09-28 18:55:49 +05:30
tunde
131f0104b0
fix production order ui test
2017-09-28 14:08:25 +01:00
tunde
18764a12c4
increase point-of-sale timeout to fix UI test
2017-09-28 11:47:27 +01:00
rohitwaghchaure
0dc3c1b114
Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo
...
[minor] Added batch item in the demo data
2017-09-28 16:07:01 +05:30
schilgod
0f6fff6f0c
item price track_changes default to 1 ( #10958 )
2017-09-28 15:28:59 +05:30
Rushabh Mehta
2b87d100fa
[fix] https://github.com/frappe/erpnext/issues/10956
2017-09-28 15:21:36 +05:30
Rohit Waghchaure
c4ee77a3cc
[minor] Added batch item in the demo data
2017-09-28 15:19:26 +05:30
tunde
d348c12bdb
fix sales order ui test
2017-09-28 09:46:31 +01:00
Sunny
3ec6960478
move Material Request patch to v9
2017-09-28 15:26:20 +08:00
Sunny
33670bba47
fix reorder_item
2017-09-28 15:24:11 +08:00
Sunny
73f1c93cd2
fix ppt code
2017-09-28 15:24:11 +08:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
0d91d3f572
add schedule_date while creating Material Request
2017-09-28 15:23:52 +08:00
Sunny
892ec599d4
[fix] tests
2017-09-28 15:23:09 +08:00
Sunny
65cd9f2284
Add patch to update schedule date of submitted Purchase Orders
2017-09-28 15:23:09 +08:00
Sunny
799d69baba
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
71866e06f3
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
284ceb7abe
Set PO Reqd By Date default in code, to next date
2017-09-28 15:22:49 +08:00
Sunny
65c7a6947a
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
f7a8277d12
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
12cb07ce3c
[fix] test records
2017-09-28 15:22:49 +08:00
Sunny
23a4b09d43
Add Material Request schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:48 +08:00
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
Nabin Hait
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
tunde
567119170e
Merge branch 'develop' into payment-terms
2017-09-26 17:28:07 +01:00
Frappe PR Bot
9aff73d156
[Translation] Updated Translations ( #10901 )
2017-09-26 17:18:42 +05:30
Prateeksha Singh
df8fbd7d72
[fix] batch qty checked against stock_qty field ( #10906 )
2017-09-26 17:16:03 +05:30
Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Nabin Hait
c0b4f0e81b
bumped to version 9.0.0
2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f
Set bill no while making payment entry from purchase invoice
2017-09-26 15:56:58 +05:30
tunde
79f9a4aef1
bug fix: sales invoice always dirty even after reloading
2017-09-26 10:39:30 +01:00
tunde
095cfc9cfc
disable some Payment Schedule fields
2017-09-26 10:25:49 +01:00
tunde
9e4dcdfbc8
rename Payment Terms Schedule section break to Payment Terms
2017-09-26 09:44:23 +01:00
rohitwaghchaure
d4c2d77bba
[fix] POS not working if user clicks on back button from form view ( #10912 )
2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1
change log for version 9
2017-09-26 12:41:43 +05:30
tunde
192587fe56
UI test cases
2017-09-26 01:32:08 +01:00
tunde
c4b0d17c08
fix bug: can't make PE for invoice with multi due date
2017-09-26 01:02:43 +01:00
tunde
31ddbe36c0
fix bug: cast to flt
2017-09-25 23:24:32 +01:00
tunde
541d3f9567
fix ui tests
2017-09-25 18:15:47 +01:00
tunde
cd9bc6f795
fix failing test
2017-09-25 14:51:21 +01:00
tunde
94c3c13ba6
fix failing tests
2017-09-25 14:47:48 +01:00
Nabin Hait
afe9eabd3c
Merge branch 'master' into develop
2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
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
tunde
90e09d4e79
fix failing tests from shopping cart
2017-09-25 11:27:32 +01:00
tunde
8a53b64ac4
Merge branch 'develop' into payment-terms
2017-09-25 10:31:42 +01:00
tunde
9bed2de726
show all duplicate rows after checking for duplicate due date
2017-09-25 10:19:35 +01:00
tunde
e52bb825ec
fix bug: form is always dirty
2017-09-25 09:02:23 +01:00
Nabin Hait
3b61552836
Revert "Advance against expense claim ( #10632 )" ( #10877 )
...
This reverts commit cdd6ded790
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
tunde
77ecacc379
validation to check for possible duplicate payment terms
2017-09-22 23:12:55 +01:00
tunde
cf42d1db5c
more tests
2017-09-22 17:20:33 +01:00
tunde
3aec78b472
make due date, invoice_portion mandatory
2017-09-22 16:22:15 +01:00
tunde
e6b3fe1215
add tests for payment term template
2017-09-22 16:04:07 +01:00
tunde
d6cf6fb124
documentation for payment terms
2017-09-22 15:49:02 +01:00
tunde
62af5c5693
more validation checks and test fixes
2017-09-22 15:16:38 +01:00
tunde
73a83a472d
validation for Payment Terms Template
2017-09-22 11:05:40 +01:00
tunde
25cda29007
fix test Employee
2017-09-21 14:33:39 +01:00
tundebabzy
e4be3f8dc9
use generator when updating and notify user of long process ( #10777 )
2017-09-21 18:27:33 +05:30
tunde
d7d306bfdb
fix final failing test
2017-09-21 13:43:38 +01:00
Nabin Hait
cdd6ded790
Advance against expense claim ( #10632 )
...
* Adds Whitelist Method for Advance Entry
* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date
* Adds changes for managing advance payments using Default Account and Party
* Removed console.log from the JS file
* Advance Payment Patch - Fixed Codacy errors
* Removed stray file
* Fixed conflicts due to changes in upstream
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed pending Codacy error
* Updated JS code by removing cur_frm which is soon to be deprecated
* Advance against Expense Claim: cleanup and fixes
* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
Nabin Hait
6d78f7b862
Fixed indentation
2017-09-21 15:51:42 +05:30
tunde
82de375ba0
Merge branch 'develop' into payment-terms
2017-09-21 11:21:05 +01:00
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
tunde
951092eecd
fix sales order and pricing rule failing tests
2017-09-21 11:14:53 +01:00
Nabin Hait
2851dfad99
Set fields in Item Variant Settings which should be copied from template to variant
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
0e28fccb34
[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated
2017-09-21 15:41:57 +05:30
tunde
99849f8eab
fix failing tests
2017-09-21 10:23:40 +01:00
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
rohitwaghchaure
12fd8a6047
[fix] User not able to complete the production order because of decimal issue ( #10868 )
2017-09-21 14:39:10 +05:30
Nabin Hait
24ec3c7dcb
Fixed merge conflict
2017-09-21 12:53:41 +05:30
tunde
ae0eb718a3
Merge branch 'develop' into payment-terms
2017-09-21 08:12:23 +01:00
Prateeksha Singh
705d885b64
[progress] R/W permission for all roles ( #10866 )
2017-09-21 12:02:18 +05:30
Manas Solanki
1c1dd08a34
only validate party account and ref doc party account in selected case ( #10863 )
...
* only validate party account and ref doc party account in selected case
* fix for fee structure test
* fix the assessment result test
2017-09-21 12:01:20 +05:30
tunde
c02f332565
Merge branch 'develop' into payment-terms
2017-09-20 15:37:34 +01:00
tunde
35c84fe4f2
fix failing test case
2017-09-20 12:26:19 +01:00
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
tunde
4712ed6377
remove logging statement
2017-09-19 21:30:34 +01:00
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
tunde
da17954919
fix failing tests
2017-09-19 17:53:31 +01:00
Nabin Hait
6960a76adc
Fixes related to schools fees
2017-09-19 17:23:03 +05:30
Manas Solanki
0664d6ed8b
real time fee creation status via socketio
2017-09-19 17:23:03 +05:30
Manas Solanki
1bcc6c661a
minor changes
2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32
add the fee schedule in config
2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85
cleanup of the fee module
2017-09-19 17:23:03 +05:30
Manas Solanki
8c88af23ef
added the test case for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
d1d2633658
removed the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb
fixes as per the review
2017-09-19 17:23:03 +05:30
Manas Solanki
49c52f7639
renamed one doctype to the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79
make payment entry for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5
make gl_entry on submission of fees
2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5
make payment request for the fee
2017-09-19 17:23:02 +05:30
Manas Solanki
f073814635
added fee request doctype
2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
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
tunde
9448f4b13c
codacy corrections
2017-09-18 12:08:34 +01:00
tunde
4bf3ed47ff
revert from trying to adjust payment schedule based on old recurring_document
2017-09-18 11:54:28 +01:00
Saurabh
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
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Nabin Hait
f8f29677fd
Merge branch 'master' into develop
2017-09-12 16:16:57 +05:30
Nabin Hait
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
tunde
ecb118fb3b
bugfix: call set_payment_schedule only in relevant doc
2017-09-11 15:45:10 +01:00
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16
Merge pull request #10737 from nabinhait/budget_variance_for_project
...
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310
[Translation] Updated Translations ( #10741 )
2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f
Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
...
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
tunde
df3a175974
fix bugs: add payment_schedule if payment_terms_schedule specified
2017-09-11 11:02:57 +01:00
Nabin Hait
509bca36b1
Reverse charge in gst print format
2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6
Merge branch 'master' into staging
2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
mbauskar
438088f69d
bumped to version 8.11.1
2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
tunde
96b8f223fd
fix failing tests
2017-09-08 15:35:59 +01:00
Faris Ansari
425f1df799
[fix] Tax area alignment ( #10690 )
2017-09-08 15:56:34 +05:30
rohitwaghchaure
225ac0dac3
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-08 10:31:21 +01:00
tunde
24cb494a3b
Revert "Revert "make payment_schedule field no-copy""
...
This reverts commit fbd895d781
2017-09-08 10:07:39 +01:00
tunde
fbd895d781
Revert "make payment_schedule field no-copy"
...
This reverts commit 4f4148b0da
2017-09-08 10:06:46 +01:00
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
4f4148b0da
make payment_schedule field no-copy
2017-09-07 18:49:10 +01:00
tunde
2d3a575f29
more test cases for purchase/sales invoice
2017-09-07 14:50:20 +01:00
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
tunde
9085a5e52d
more test cases for quotation, purchase/sales order
2017-09-07 14:31:33 +01:00
tunde
b0f6b068ef
remove test based on deleted recurring_document.py
2017-09-07 13:50:46 +01:00
Rohit Waghchaure
06b22e9ac1
[Fix] Customer search optimization for the offline POS
2017-09-07 17:44:42 +05:30
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
tunde
67f3d854bc
test for quotation
2017-09-07 12:22:48 +01:00
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Vishal Dhayagude
c79d14190f
[fix] travis failed ( #10702 )
2017-09-07 16:05:41 +05:30
tunde
353099d7ad
Merge branch 'develop' into payment-terms
2017-09-07 11:31:26 +01:00
tunde
788de8001c
more tests
2017-09-07 11:30:06 +01:00
tunde
32aa7c1e68
Automatically set payment schedule if not specified
...
- fix failing test cases
- fix failing tests for recurring documents
- others
2017-09-07 06:52:15 +01:00
tunde
dba6f841e6
refactor: DRY for due date disabled
2017-09-07 06:51:07 +01:00
Rushabh Mehta
2e8e5354e9
[fix] trainig_feedback.py
2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633
[rename] /test_training_event_attendance.js
2017-09-07 09:07:15 +05:30
Rushabh Mehta
134d59949a
[minor] update warehouse_group in item.reorder_levels
2017-09-07 09:04:24 +05:30
Prateeksha Singh
2697e332f3
[fix] wizard UI test order ( #10663 )
...
* [fix] wizard ui test order
* [setup] remove old test
* [fix] commit to remove lock from defaults table during setup
2017-09-07 09:03:16 +05:30
tunde
e7da1c5500
refactor: DRY for disable due date logic
2017-09-06 12:36:45 +01:00
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
tunde
9e32387aa7
fix customer test records
2017-09-06 09:44:45 +01:00
tunde
794001df50
more test cases in Supplier
2017-09-06 09:16:11 +01:00
tunde
98fd5401ff
test customer
2017-09-06 08:47:14 +01:00
rohitwaghchaure
ec46e51ed4
Merge pull request #10426 from nabinhait/payment_entry_deductions
...
Unallocated and difference amount calculation in Payment Entry
2017-09-06 13:04:25 +05:30
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
rohitwaghchaure
914fd197fc
Update test_payment_against_invoice.js
2017-09-06 12:42:58 +05:30
Faris Ansari
8868ae22be
[fix] Tax area alignment ( #10690 )
2017-09-06 12:17:12 +05:30
Nabin Hait
ded8d11728
Js tests added for write off difference amount
2017-09-06 12:11:48 +05:30
Nabin Hait
6c3618be37
Unallocated and difference amount calculation in Payment Entry
2017-09-06 12:10:52 +05:30
Rushabh Mehta
6ef741554c
[fix] [patch] rename_company_sales_target_field.py
2017-09-06 10:53:26 +05:30
tunde
98cca8ee18
remove unused imports
2017-09-06 06:11:58 +01:00
tunde
8173239f63
Merge branch 'develop' into payment-terms
2017-09-06 04:18:40 +01:00
tunde
e5973e45f1
fix test
2017-09-05 18:11:58 +01:00
tunde
e0cec4ef05
Merge branch 'payment-terms' of https://github.com/tundebabzy/erpnext into payment-terms
2017-09-05 17:37:35 +01:00
tunde
a496c43581
fix test
2017-09-05 17:36:21 +01:00
mbauskar
668d04548a
Merge branch 'master' into develop
2017-09-05 20:45:00 +05:30
mbauskar
d4316f0264
bumped to version 8.11.0
2017-09-05 21:14:58 +06:00
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
Nabin Hait
799619b6b0
Fixed multiple uom in selling
2017-09-05 15:52:12 +05:30
tundebabzy
dc64f70f07
Merge branch 'develop' into payment-terms
2017-09-05 11:14:47 +01:00
Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97
Company Dashboard Title Translatable ( #10673 )
2017-09-05 15:09:35 +05:30
creamdory
05885ca184
Sorting in Production Order BOM Items
2017-09-05 17:02:54 +08:00
Rohit Waghchaure
2967d7ed01
Merge branch 'bom_currency' into develop
2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76
update rate based on uom conversion factor
2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf
[Translation] Updated Translations ( #10669 )
2017-09-05 09:19:06 +05:30
tunde
7f9a462506
Merge branch 'develop' into payment-terms
2017-09-05 01:35:51 +01:00
tunde
743ba690dd
more test cases for Supplier
2017-09-05 01:17:14 +01:00
tunde
ed86efb1fd
modify get_due_date to check Supplier Type if needed
2017-09-05 01:15:31 +01:00
tunde
b8ddae13ba
fix patches
2017-09-05 00:23:24 +01:00
tunde
2fdb857fed
fix due date disable bug
2017-09-05 00:21:54 +01:00
tunde
60aecd87b1
fix bugs in patches
2017-09-04 19:40:31 +01:00
tunde
4e4a40e46b
add new field payment_terms to Supplier Type
2017-09-04 19:38:41 +01:00
tunde
635423d70f
rewrite Supplier test cases
2017-09-04 19:37:54 +01:00
tunde
57171cdc48
patch for credit days in Supplier Type
2017-09-04 19:33:35 +01:00
tunde
95b3d7c619
patch for payment term field in Supplier Type
2017-09-04 19:32:14 +01:00
tunde
4163c9529d
fix get_due_date function to return date as string
2017-09-04 19:30:01 +01:00
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
tunde
c6d60e1de3
update patch list
2017-09-04 13:41:17 +01:00
tunde
bc9b5d699e
fix patch
2017-09-04 13:40:54 +01:00
tunde
76bba08e45
patch to create and set default payment term in customer/supplier
2017-09-04 13:37:32 +01:00
tunde
feffca2b05
patch to add payment_terms_field
2017-09-04 13:34:31 +01:00
mbauskar
7faac85fff
Merge branch 'master' into staging
2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
mbauskar
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
tunde
975eff7310
remove redundant test case
2017-09-01 12:10:44 +01:00
Umair Sayed
f1881065a8
Merging Help Articles (Q & A) into Manual (Part 2) ( #10629 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
tunde
cbd72f6113
adjust failing tests
2017-09-01 11:48:00 +01:00
tunde
7b7dcddf86
modify get_due_date call from sales/purchase invoice
2017-09-01 11:36:08 +01:00
tunde
b3a6338c79
patch replace credit_days with payment terms schedule
2017-09-01 11:35:22 +01:00
tunde
f0e9dd2597
patch to add due_date to GL Entry table
2017-09-01 11:34:26 +01:00
Rushabh Mehta
fc1c00716c
[test] test_account.js - more timeout?
2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00
[test] test_account.js
2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6
[test] test_account.js
2017-09-01 11:46:11 +05:30
tunde
1c2edaebc4
patch customer records
...
- creates payment term and payment term template based on credit_days setting
- sets payment term template for records that had credit_days
2017-08-31 22:52:06 +01:00
tunde
8935f6546c
removes get_credit_days function as it is no longer useful
2017-08-31 16:31:15 +01:00
tunde
3b4bd3791d
adjust get_due_date to calculate based on payment term template
2017-08-31 16:28:47 +01:00
tunde
e44ce5d88e
adjustment: removes credit_days_based on and credit_days fields
2017-08-31 16:11:42 +01:00
tunde
657ecd5227
adjustment: removes credit_based_on field
2017-08-31 16:06:56 +01:00
Nabin Hait
a9c9b69c22
Change actual charges based on exchange rate ( #10619 )
...
* Change actual charges based on exchange rate
* Update transaction.js
2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244
[Translation] Updated Translations ( #10628 )
2017-08-31 19:38:41 +05:30
tunde
229b583715
disable due date field if form has payment schedule data
2017-08-31 14:30:53 +01:00
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
tunde
50ec45d3b6
Merge branch 'develop' into payment-terms
2017-08-31 13:46:02 +01:00
tunde
400d046653
set payment terms template in get_party_details
2017-08-31 13:44:57 +01:00
Saurabh
60739847ab
[minor][fix] change price field type from float to currency ( #10626 )
2017-08-31 17:08:30 +05:30
tunde
762c810fa2
add payment terms to supplier master
2017-08-31 11:52:49 +01:00
tunde
2775175b17
add payment terms to customer master
2017-08-31 11:52:14 +01:00
mbauskar
9012a9b414
Merge branch 'master' into staging
2017-08-31 15:31:48 +05:30
mbauskar
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
tunde
3dfbd957b7
add payment terms to supplier master
2017-08-31 09:42:01 +01:00
tunde
226164d81c
add payment terms in customer master
2017-08-31 09:41:25 +01:00
Makarand Bauskar
de278635a3
[hotfix] fixes for UnicodeDecodeError ( #10620 )
2017-08-31 13:36:56 +05:30
tunde
e5460ab1df
rename patch
2017-08-30 22:37:14 +01:00
tunde
6de18ce589
codacy fixes
2017-08-30 21:20:41 +01:00
tunde
93c015a42b
add due_date in GL Entry from Journal Entry
2017-08-30 21:05:38 +01:00
tunde
501ef8733b
fix due_date autopopulate commit
2017-08-30 21:02:20 +01:00
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
tunde
4e490ad718
Merge branch 'develop' into payment-terms
2017-08-30 14:11:40 +01:00
tunde
08d8ca0184
enhance reference_due_date behaviour:
...
- creates new api - get_invoice_due_dates
- when reference_name is changed, populate reference_due_date
2017-08-30 13:55:32 +01:00
tunde
2883662ccb
change due_date to reference_due_date in Journal Entry Account
2017-08-30 08:45:28 +01:00
Faris Ansari
6163a397df
Disable eslint in lib
2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec
Merge branch 'master' into hotfix
2017-08-29 20:42:06 +05:30
mbauskar
a896e52489
resolved merge conflicts
2017-08-29 20:41:59 +05:30
mbauskar
c0f34f454b
bumped to version 8.10.0
2017-08-29 21:08:21 +06:00
tunde
a19ea6e2f3
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms
2017-08-29 15:26:50 +01:00
Rohit Waghchaure
70aaff46be
minor fix in item group search
2017-08-29 19:19:58 +05:30
tundebabzy
1a947dbf6a
Item Name not loaded in Material Request via BOM ( #10535 ) ( #10555 )
...
* adds item_name to child table
* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table
* removes empty first row after getting from BOM
* ui test
2017-08-29 18:18:27 +05:30
tunde
7555a4a13e
fix patch and also patch payment entries
2017-08-29 13:40:16 +01:00
Faris Ansari
c70bbacd34
Add online, offline option, fix search
2017-08-29 15:27:17 +05:30
tunde
3b327ed55f
'modify patch to also adjust journal entries'
2017-08-29 10:23:19 +01:00
Faris Ansari
655f86d5e2
UI fixes
2017-08-29 14:27:01 +05:30
Faris Ansari
b9939a6449
Merge pull request #10448 from joelios/selfpostback
...
improvement for self-postbacks
2017-08-29 14:05:13 +05:30
Faris Ansari
6f50b3a5b2
handle both cases
2017-08-29 14:02:49 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Faris Ansari
847f9f80c1
Merge pull request #10559 from mntechnique/pos_scanner_hotfix
...
[Fix] POS Scanner
2017-08-28 16:54:01 +05:30
Vishal Dhayagude
7ed4bfe7ee
[UI Test] UI Test for Material Receipt with Serialize Item Added ( #10565 )
...
* [UI Test] UI Test for Material Receipt with Serialize Item Added
* [fix]Codacy fixed
2017-08-28 16:53:25 +05:30
Faris Ansari
8fbc08f91f
Decrease timeout to 400
2017-08-28 16:52:20 +05:30
Vishal Dhayagude
872bebbbf8
[UI Test] Stock Entry for Subcontract ( #10574 )
2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996
[UI Test] Stock Entry for Material Transfer to Manufacture ( #10572 )
2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab
resolved merged conflicts
2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
mbauskar
d44af40de8
bumped to version 8.9.2
2017-08-28 12:26:17 +06:00
Nabin Hait
2df0788c11
Validate for negative outstanding reference only if party is Customer or Supplier ( #10568 )
2017-08-28 11:23:33 +05:30
Vishal Dhayagude
914b8463b7
[UI Test] UI Test for Payment Request Added: ( #10553 )
2017-08-28 11:14:28 +05:30
Utkarsh Goswami
7ba2a83182
Tests for Loan ( #10557 )
2017-08-28 11:13:16 +05:30
Vishal Dhayagude
554cf9be44
[UI Test] UI Test Added for Bank Reconciliation ( #10563 )
2017-08-28 11:11:36 +05:30
Vishal Dhayagude
da2164373c
[UI Test] UI Test added for Batch ( #10564 )
2017-08-28 11:10:26 +05:30
Vishal Dhayagude
c3a2204653
[UI Test] UI Test for Sales Order Cancel, amend and save ( #10570 )
2017-08-28 11:09:35 +05:30
tunde
63c8cb2fd1
add due_date to Journal Entry Account doctype
2017-08-27 17:56:47 +01:00
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Revant Nandgaonkar
2558daf6b7
Allow search without keypress enter
2017-08-26 15:52:35 +05:30
Revant Nandgaonkar
2f7cb82ca0
[Fix] POS Scanner
...
Search item based on key press instead of 1sec wait
Fast Scanning needs this to avoid 1sec delay
2017-08-26 09:58:15 +05:30
tunde
6b2d9e4990
patch to add due date to GL Entries for Sales/Purchase invoice
2017-08-25 15:25:18 +01:00
Zarrar
7dc113e977
instructor-naming ( #10550 )
2017-08-25 17:48:36 +05:30
Utkarsh Goswami
579c8e68f9
Tests for Expense Claims [HR] ( #10514 )
2017-08-25 16:12:49 +05:30
Ashwini Save
e33a1e0515
Hide "Help Article" button for timeline Communication type "Comment". ( #10541 )
2017-08-25 12:44:33 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Utkarsh Goswami
9a04da27b0
Test for training ( #10545 )
2017-08-25 12:01:04 +05:30
AravindPranera
764bb30d2d
Fetching Opportunity items into Request for Quotation
2017-08-24 18:34:45 +05:30
AravindPranera
6544a85f1e
Opportunity Items fetching into Request for quotation
2017-08-24 18:32:40 +05:30
Manas Solanki
8de7c0245c
Fixes in the naming series ( #10480 )
...
* rewrite the js
* fix the space issue in the naming series
2017-08-24 17:51:23 +05:30
Vishal Dhayagude
17b2720f5b
[UI Test] UI Test for Payment Entry ( #10521 )
2017-08-24 17:50:28 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
Zarrar
1010a2a2a4
Resolving some issues in school [ issue no:- #10464 ] ( #10529 )
...
* guardian_name issue fix
* guardian table issue resolved
* resolved fetching issue + unnecessary code removed
2017-08-24 16:22:06 +05:30
Utkarsh Goswami
3da5574d79
Test for appraisal ( #10525 )
2017-08-24 15:48:57 +05:30
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Rushabh Mehta
7e506af0b9
[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 ( #10538 )
2017-08-24 15:23:33 +05:30
tunde
f7e87e66ee
do correct gl entry for debit and credit notes
2017-08-23 22:36:25 +01:00
Rushabh Mehta
72fa958f2c
[layout] lead and opportunity ( #10487 )
2017-08-23 18:47:57 +05:30
Vishal Dhayagude
641d88fd6b
[UI Test] UI Test added for Journal Entry ( #10512 )
...
* [UI Test] UI Test added for Journal Entry
* [mod] Edited date in journal Entry
* [fix] Codacy fixed
2017-08-23 18:32:12 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Rushabh Mehta
4a546e6c18
[minor] delivery note standard filter
2017-08-23 16:16:43 +05:30
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
tunde
d13fe18d30
Merge branch 'develop' into payment-terms
2017-08-22 14:18:11 +01:00
Doridel Cahanap
a6a93cbe06
[Fix] Request for Quotation Portal Title ( #10489 )
2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343
[UI Test] UI test for Sales Invoice with Payment Entry ( #10483 )
...
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593
Travis fix for purchase order receipt ( #10498 )
2017-08-22 17:39:06 +05:30
mbauskar
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
tunde
10fc880b06
Merge branch 'develop' into payment-terms
2017-08-21 18:27:46 +01:00
Makarand Bauskar
a591d1df5f
[minor] ingore user permission for old_parent fields ( #10471 )
2017-08-21 19:04:49 +05:30
Rohit Waghchaure
33326fe90e
[Fix] Pricing rule applying only on item groups defined in POS profile
2017-08-21 16:30:21 +05:30
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
Ameya Shenoy
c87c1dbbbf
converted production tests to INR from USD ( #10472 )
2017-08-21 14:10:04 +05:30
Rushabh Mehta
575ab3ab70
[docs] for print style ( #10452 )
2017-08-21 12:24:28 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
mbauskar
ddb26d02e5
bumped to version 8.8.4
2017-08-21 09:27:32 +06:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Zarrar
196b491ac4
[ui test ] Travis failing fix ( #10468 )
...
* Value in assertion was wrong
* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
Nabin Hait
1f49f511aa
Tax rate in Itemised sales/purchase register and cleanups ( #10439 )
2017-08-21 08:05:12 +05:30
rohitwaghchaure
0d9ab86496
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa ( #10453 )
2017-08-21 07:52:49 +05:30
rohitwaghchaure
6b1624cfee
[Fix] Tax rule is not working for the parent customer groups ( #10458 )
2017-08-21 07:38:37 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Makarand Bauskar
80d06da978
[hotfix] fixed mysql syntax error in Student and Guardian Contact Details report ( #10450 )
2017-08-21 07:34:45 +05:30
tunde
fb144303f5
codacy and typo fixes
2017-08-20 17:23:55 +01:00
tunde
c7f46218d7
tests and test fixes
...
fixes test case:
make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month'
so that it doesn't conflict with payment term due date
fix test case:
create purchase invoice with new supplier with credit_days_based_on
"Fixed Days" as the default "Last Day of Month" does not apply when
using payment terms
2017-08-20 17:23:27 +01:00
tunde
be1b871c53
modify validation if doc has payment term schedule
2017-08-20 17:22:59 +01:00
tunde
4c5efa3dec
renames set_payment_schedule and removes it from validation
2017-08-20 17:22:06 +01:00
tunde
43870aa8db
moves set_payment_schedule and validate_payment_schedule to accounts_controller
2017-08-20 16:56:43 +01:00
tunde
20c041cea4
add Payment Term to Purchase Invoice
2017-08-20 16:52:05 +01:00
tunde
b76ab49ede
add Payment Term to Purchase Order
2017-08-20 16:52:05 +01:00
tunde
9df5e004cf
add Payment Terms to Sales Order
2017-08-20 16:52:05 +01:00
tunde
bc174d980c
add Payment Term to Quotation
2017-08-20 16:52:05 +01:00
Nabin Hait
9275969b51
Payment Terms: doctypes, schedule, payments and more
...
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months
fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
2017-08-20 16:51:29 +01:00
KanchanChauhan
dd351c585a
[Minor] Title added to rfq web view ( #10454 )
2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Vishal Dhayagude
592e8c2e77
[UI Test] UI Test added for Stock Reconciliation ( #10432 )
...
* [UI Test] UI Test added for Stock Reconciliation
* [fix] Codacy
2017-08-18 15:01:20 +05:30
Utkarsh Goswami
5a27aead06
Test for Process Payroll ( #10447 )
2017-08-18 13:12:53 +05:30
Rohit Waghchaure
f03a73466c
Added modal for multi mode payment, provision to add write off and change amount
2017-08-18 12:15:19 +05:30
Utkarsh Goswami
ca63cc6439
[UI Test Recruitment] To test Recruitment in HR module ( #10441 )
...
* Tests for Recruitment
* Codacy fix
2017-08-18 11:57:01 +05:30
Vishal Dhayagude
2890fa74a2
[UI Test] UI Test for Purchase Receipt Added ( #10434 )
2017-08-18 11:55:14 +05:30
Joel Mesmer
97c1bcf14f
improvement for self-postbacks
2017-08-17 22:20:18 +02:00
Zarrar
780f11ec16
path to test updated ( #10438 )
2017-08-17 18:36:33 +05:30
Makarand Bauskar
fe43ecb5ee
[hotfix] fixed type in gst_state_code_data.json file ( #10437 )
2017-08-17 17:34:25 +05:30
rohitwaghchaure
fff56530c4
[Fix] Due date not fetching on the payment entry against the invoices ( #10419 )
2017-08-17 14:47:25 +05:30
Nabin Hait
5b266eff89
Update patches.txt
2017-08-17 14:42:50 +05:30
Faris Ansari
0f3d431476
Update cart ui from cur_frm, Add number pad
2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284
Added functional part
2017-08-17 12:56:14 +05:30
Faris Ansari
7bcb1cfc42
more styling
2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945
Styling for search fields
2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7
Add clusterize, move customer field to POSCart, get POS profile
2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2
[wip] New POS UI
2017-08-17 12:56:14 +05:30
Makarand Bauskar
446c2b0e91
[hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays ( #10355 )
2017-08-17 12:39:35 +05:30
Ben Cornwell-Mott
ee9f9863ff
MORE CODACY
2017-08-17 11:29:11 +05:30
Ben Cornwell-Mott
9727a3fe50
More codacy issues
2017-08-17 11:27:31 +05:30
Rohit Waghchaure
df83191ea0
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-17 11:27:30 +05:30
Ben Cornwell-Mott
13218f7d76
Fixed codacy issues
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
bea7d9f919
Added tests
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
1b43515160
Codacy fixes
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
48058a88e5
Minor cleanup
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
f7e42211b9
Added Quote Status to RFQ Suppliers with No Quote
2017-08-17 11:18:49 +05:30
Zarrar
abd3419632
made test less dependent on python test data ( #10424 )
2017-08-17 11:04:16 +05:30
Shreya Shah
b5ed6823d6
[UI Test] Buying - Create Purchase receipt ( #10421 )
...
* Create purchase receipt after submitting the purchase order
* Checks quantity and rate in stock ledger
2017-08-17 11:03:43 +05:30
Vishal Dhayagude
f37eacdee5
[UI Test] Purchase Invoice ( #10422 )
...
* [UI Test] Purchase Invoice
* [fix] Travis failed
2017-08-17 11:01:59 +05:30
Nabin Hait
64c32dcd59
[fix] Update monthly sales value on Company ( #10417 )
...
* [fix] Update monthly sales value on cancellation of invoice, also update modified datestamp
* Company monthly sales: patches and test cases
2017-08-16 15:04:18 +05:30
Zarrar
9eb8680ec9
travis failing issue fix ( #10420 )
2017-08-16 13:25:31 +05:30
tundebabzy
f35710db15
remove empty first row if needed ( #10378 )
...
refactor code: move global functions to callback scope
2017-08-16 13:25:18 +05:30
tundebabzy
258faab761
Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency ( #10409 ) ( #10410 )
...
* properly keep track of document currency and company currency
* Update taxes_and_totals.js
2017-08-16 13:16:46 +05:30
tundebabzy
5fc5b68a49
update multi currency accounting documentation to remove incorrect info ( #10404 )
2017-08-16 11:41:56 +05:30
Manas Solanki
0371d5a326
new item group filter in the stock ledger report ( #10400 )
2017-08-16 11:35:04 +05:30
Utkarsh Goswami
44b088c6b3
[UI Test Salary] To test the salary structure and the salary slip ( #10407 )
...
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Travis CI fixes
* Updated
* Updated
* travis fixes
* Travis fixes
2017-08-16 11:32:04 +05:30
Shreya Shah
289400d944
[UI Test] Buying module - Multiple tests for Purchase orders ( #10414 )
...
* Extended timeout to avoid rare failures
* Get purchase orders with discount on grand total
* Get purchase orders with discount on individual items
* Get purchase orders and calculate taxes
* Added paths
2017-08-16 11:31:34 +05:30
Faris Ansari
21fc26c2a2
Update cart ui from cur_frm, Add number pad
2017-08-14 18:25:59 +05:30
Shreya Shah
f6544e95d4
[UI Tests] Buying Module - Supplier quotations and Purchase orders ( #10397 )
...
* Get Supplier Quotation with item wise discount
* Get purchase orders
* Added paths
* Codacy fix
2017-08-14 17:29:09 +05:30
Rushabh Mehta
4f366e9c38
[fix] conflicts
2017-08-14 16:15:20 +05:30
Rushabh Mehta
683b015951
[fix] email alert
2017-08-14 15:03:33 +05:30
Makarand Bauskar
0973161ae5
[docs] Translate the Schools Assessment section documentation to Spanish ( #10398 )
...
* [docs] Translate the Schools app documentation to Spanish
* [docs] Translate the Schools Student section documentation to Spanish
* [docs] Translate the Schools SETUP section documentation to Spanish
* [docs] Translate the Schools ADMISSION section documentation to Spanish
* [docs] Translate the Schools FEES section documentation to Spanish
* [docs] Translate the Schools SCHEDULE section documentation to Spanish
* [docs] Translate the Schools Assessment section documentation to Spanish
2017-08-14 14:55:48 +05:30
mbauskar
40377e87de
Merge branch 'master' into staging
2017-08-14 12:33:56 +05:30
mbauskar
4ca3e8f70a
Merge branch 'master' into develop
2017-08-14 12:33:55 +05:30
mbauskar
e0cc7c64a1
bumped to version 8.8.3
2017-08-14 13:03:55 +06:00
Makarand Bauskar
e5ae4d3bd3
send email via the background jobs ( #10374 ) ( #10393 )
...
* send the email via the background worker in the payment request (#10350 )
* send email via the background jobs (#10374 )
2017-08-14 12:22:50 +05:30
Vishal Dhayagude
7186131d65
[UI Test] sales invoice ( #10394 )
...
* [UI Test] Sales Invoice
* [UI Test] Sales Invoice
2017-08-14 12:22:04 +05:30
Rushabh Mehta
1132502e14
[fix] test
2017-08-14 12:09:30 +05:30
Rushabh Mehta
ea573e2421
[training] update names
2017-08-14 11:53:34 +05:30
Rushabh Mehta
1fe1a47658
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
6cb14cfc04
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
89505522d3
[docs] update docs
2017-08-14 11:53:34 +05:30
Rushabh Mehta
550b0fab84
[fixes] email notifications by email alert on training event and result
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
35a4e587ee
Fixes for camel_case and translations
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e92b4737e3
codacy fixes
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
94c6b7409b
Updated documentation
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e9dbafcc10
Improve email format for training event, add ui test
2017-08-14 11:53:34 +05:30
Rohit Waghchaure
854d335ab1
Added functional part
2017-08-14 11:34:42 +05:30
Manas Solanki
a5cb9ae8bd
send email via the background jobs ( #10374 )
2017-08-14 09:50:15 +05:30
mbauskar
f03afe0878
Merge branch 'master' into staging
2017-08-14 09:31:01 +05:30
mbauskar
2fa8af3b02
Merge branch 'master' into develop
2017-08-14 09:31:01 +05:30
mbauskar
b2f160eef0
bumped to version 8.8.2
2017-08-14 10:01:00 +06:00
Shreya Shah
67e2ef30c4
[UI test] Buying module - Get Supplier Quotations ( #10375 )
...
* Get quotations for Suppliers
* Calculate taxes and charges for Supplier quotations
* Added paths for tests
* Codacy fix
* Improvised the page route function
2017-08-14 09:17:00 +05:30
tundebabzy
041b9c3c32
make item name read only and add hide if not saved ( #10382 )
2017-08-14 09:16:07 +05:30
Vishal Dhayagude
22baba2cff
[UI TEST] Test added for Delivery Note ( #10376 )
2017-08-11 17:17:30 +05:30
Faris Ansari
7273cb7f54
Track changes in Account doctype ( #10373 )
2017-08-11 16:19:28 +05:30
Faris Ansari
5a13087939
more styling
2017-08-11 15:49:23 +05:30
Vishal Dhayagude
4157b64776
[UI Test] Multiple UI Test for Stock Entry added ( #10354 )
2017-08-11 12:06:16 +05:30
Shreya Shah
9e30969243
Fetching items from material requests doctype ( #10363 )
2017-08-11 12:02:35 +05:30
Rushabh Mehta
dbb5154f37
Fixes in Order / Quotation ( #10361 )
...
* Additions in Order Page for Sidebar Menu with "Order" page route
* Adjust Columns in order_taxes.html to avoid number breaks for more precisions
* Fields additions in transaction_row.html
* [fix] style for order pages, indicator for quotation etc
* [fix] style for order pages, indicator for quotation etc
* [test] add timeout
2017-08-10 21:06:09 +05:30
Faris Ansari
f7c7ff4aae
Styling for search fields
2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6
Add clusterize, move customer field to POSCart, get POS profile
2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979
[wip] New POS UI
2017-08-10 17:17:49 +05:30
Shreya Shah
5ae39ae79a
Get Quotation requests and send emails to suppliers ( #10356 )
2017-08-10 16:20:47 +05:30
rohitwaghchaure
2e8232e7aa
[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company ( #10320 )
2017-08-10 11:32:59 +05:30
Makarand Bauskar
aac8349391
[hotfix] remove the white spaces from condition and formula fields ( #10331 )
...
* [hotfix] remove the white spaces from condition and formula fields
* [tests] added tests cases for whitespaces in formula and condition fields
2017-08-10 11:25:49 +05:30
Manas Solanki
a854ea00a5
mark holiday in the employee monthly attendance sheet ( #10349 )
2017-08-10 11:20:58 +05:30
Manas Solanki
e97f587411
send the email via the background worker in the payment request ( #10350 )
2017-08-10 11:17:38 +05:30
rohitwaghchaure
35438b6fc0
[Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity ( #10351 )
2017-08-10 11:15:50 +05:30
Zarrar
14468e79a3
[ui test] Student assessment and result ( #10353 )
...
* updated to test more thoroughly
* backbone set to generate result
* rebased with develop
2017-08-10 10:56:22 +05:30
Shreya Shah
243f091b30
Get supplier details ( #10352 )
2017-08-10 10:51:47 +05:30
Vishal Dhayagude
e05c2e5d95
[UI Test] for Stock Entery ( #10346 )
2017-08-09 17:36:04 +05:30
rohitwaghchaure
5999ade43a
[Fix] Auto batch creation not working for purchase invoice is update stock is enabled ( #10348 )
2017-08-09 17:24:13 +05:30
Vishal Dhayagude
bde05e96a6
[UI TEST] Multiple test for Materail request ( #10347 )
2017-08-09 16:56:14 +05:30
Vishal Dhayagude
da30a69ee7
[UI Test] test added for Material Request ( #10338 )
...
* [UI Test] test added for Material Request
* [mod] date in material request
2017-08-09 13:08:38 +05:30
mbauskar
42251da131
Merge branch 'master' into develop
2017-08-09 11:17:55 +05:30
mbauskar
3e29a28cee
bumped to version 8.8.1
2017-08-09 11:47:55 +06:00
Makarand Bauskar
60fcf47f6a
[hotfix] changed the modified date for quotation ( #10337 )
2017-08-09 11:15:18 +05:30
Rushabh Mehta
dfd8f9b0ce
[docs] move calculate-incentive-for-sales-team.md
2017-08-09 10:49:59 +05:30
Rushabh Mehta
c957ce161f
[fix] titles
2017-08-09 10:46:17 +05:30
Rushabh Mehta
67884cb7cf
[fix] remove 2fa from wizard docs
2017-08-09 10:46:17 +05:30
Zarrar
17e35e6ac7
[ui tests] Student attendance and leave application ( #10326 )
...
* spelling error rectified
* setting up leave application
* marking attendance and checking
* typo error fixed
2017-08-08 18:24:15 +05:30
Vishal Dhayagude
135560e170
[UI Test] Multiple UI Test for Quotation ( #10330 )
2017-08-08 18:22:53 +05:30
rohitwaghchaure
468fb97c81
[Fix] Lead address not able to select on the quotation ( #10328 )
2017-08-08 17:27:58 +05:30
Doridel Cahanap
96e52be5f1
[Enhancement] Allow Sidebar Menu record search using text from Item Name of a record ( #10324 )
...
* Search Record in Sidebar Menu Using Item Name for Order Page
* Test Case to create 2 Quotations with different Items
2017-08-08 17:12:50 +05:30
mbauskar
53f0f62f1c
Merge branch 'master' into develop
2017-08-08 16:07:57 +05:30
mbauskar
e77102ea47
bumped to version 8.8.0
2017-08-08 16:37:56 +06:00
Nabin Hait
7f476b4528
The series added for Asset Depreciation Entry ( #10268 )
2017-08-08 15:01:02 +05:30
Makarand Bauskar
b985ad2a8e
[minor] fixes for pos_profile in make-demo ( #10289 )
2017-08-08 15:00:30 +05:30
ckosiegbu
1ac6bcba23
Removal of SMS Settings and SMS Parameters from ERPNext ( #10033 )
...
* Removal of SMS Settings and SMS Parameter from ERPNext.
* [DOCS]Documentation for Two Factor Authentication
* [Patch]Point SMS module to frappe core
* Rearrange doc help index.txt to fit
* [DOCS]Update Documentation for Two Factor Authentication
2017-08-08 14:55:30 +05:30
Nabin Hait
32992d555d
Added chart of accounts for Argentina, France, Brazil and Hungary ( #10312 )
2017-08-08 14:42:04 +05:30
KanchanChauhan
71088aa2bd
Supplier Part No in Purchase Receipt since it exits in Purchase Order ( #10314 )
2017-08-08 14:41:35 +05:30
mbauskar
1065679720
Merge branch 'master' into staging
2017-08-08 12:54:12 +05:30
mbauskar
6b0b7912c4
Merge branch 'master' into develop
2017-08-08 12:54:12 +05:30
mbauskar
1846d0fa2f
bumped to version 8.7.3
2017-08-08 13:24:11 +06:00
Rushabh Mehta
09d1eaa87b
[minor] standard filters
2017-08-08 12:00:04 +05:30
Zarrar
40343da1b0
Student group creation ( #10308 )
...
* auto-fills groups with students
* improvised and rectified tests
* increased timer to avoid rare failures
* removed duplicate code
* requested changes implemented
* changes implemented
2017-08-08 11:43:28 +05:30
Saurabh
3a4b6c2cba
[fix] redirect to payment url if paying via web portal ( #10265 )
...
* [fix] redirect to payment url if paying via web portal
* [fix] test case fix
* [fix] test case fixes
2017-08-08 11:29:11 +05:30
KanchanChauhan
255c5f4407
Supplier Delivery Note field added to Purchase Receipt, good to have for future references ( #10309 )
2017-08-08 11:23:45 +05:30
rohitwaghchaure
9ef1d0f5a5
[Fix] Balance sheet not working ( #10311 )
2017-08-08 11:23:25 +05:30
Nabin Hait
738d8c2e0f
Changed patch order to reload domain
2017-08-08 11:15:13 +05:30
Manas Solanki
c0fb428075
print format for the assessment report ( #10227 )
...
* print format for the assessment report
* fix for the comma in assessment plan
2017-08-07 13:54:39 +05:30
Nabin Hait
632f7673d5
Added total row in GST reports ( #10292 )
2017-08-07 13:50:16 +05:30
Nabin Hait
79005e83d7
Merge pull request #10293 from ashwinisave35/knowledge_base_button
...
Changed Text of Knowledge base button to Help Article
2017-08-07 13:50:02 +05:30
Nabin Hait
19128134a8
Merge pull request #10295 from tundebabzy/issue-10099-2
...
BOM Currency symbol issue (#10099 ) - Stock Ledger report
2017-08-07 13:49:22 +05:30
tunde
80a9f37272
add options in get_columns
2017-08-04 12:08:09 +01:00
Ashwini Save
cbef770ed7
Changed Text of Knowledge base button to Help Article
2017-08-04 16:14:38 +05:30
Nabin Hait
51b4167cdd
Merge pull request #10269 from tundebabzy/currency-issues
...
BOM - Currency symbol issue (#10099 )
2017-08-04 15:36:35 +05:30
Zarrar
82d2828be6
[ui test] Student Group - manually and using creation tool ( #10283 )
...
* fixing issues in original files
* creating a student log
* student group - manually and using creation tool
2017-08-04 15:33:27 +05:30
mbauskar
4ef1e2046b
Merge branch 'master' into staging
2017-08-04 14:08:57 +05:30
mbauskar
e770824568
Merge branch 'master' into develop
2017-08-04 14:08:57 +05:30
mbauskar
4796e8e317
bumped to version 8.7.2
2017-08-04 14:38:56 +06:00
Rohit Waghchaure
499144fd86
Fixed test cases for dynamic link order
2017-08-04 13:30:59 +05:30
Makarand Bauskar
b96e239cc0
[hotfix] ignore if project type is None ( #10284 )
2017-08-04 11:40:23 +05:30
mbauskar
cce79255fe
resolved merge conflicts
2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68
resolved merge conflicts
2017-08-04 11:07:07 +05:30
mbauskar
8cf951b574
bumped to version 8.7.1
2017-08-04 11:35:01 +06:00
rohitwaghchaure
0c1d441aa3
Test case for dynamic link order ( #10276 )
2017-08-04 10:55:46 +05:30
rohitwaghchaure
5906ddf804
[Fix] View ledger button not disaplying in the head of an account ( #10254 )
...
* [Fix] View ledger button not disaplying in the head of an account
* Show view ledger button in account if user has permission to read GL Entry data
2017-08-04 10:52:01 +05:30
Zarrar
326acc3ecb
[ui test] fixed tests that used fees in any way ( #10279 )
...
* course table dependency on fee structure bypassed
* testing related to fees removed
* added more students data
* codacy fix
2017-08-04 10:51:26 +05:30
Vishal Dhayagude
592add9f0a
[UI Test] Sales Order with Shipping Rule and Pricing Rule Added ( #10270 )
...
* [UI Test] Sales Order with Shipping Rule Added
* [UI Test] Sales Order with Pricing Rule Added
2017-08-04 10:51:08 +05:30
Rushabh Mehta
1696294847
[fix] remove property setter for project type ( #10277 )
...
* [fix] remove property setter for project type
* [patch] project type
2017-08-04 10:50:56 +05:30
Ameya Shenoy
4331067e57
[ui-test] completed tests for manufacturing ( #10218 )
...
* modified test_item to include child table assertions
* minor travis fixes
* removed css selectors and used cur_frm
2017-08-04 10:50:32 +05:30
rohitwaghchaure
046e1a6e28
[Fix] Patch broken if serial no has single quote ( #10262 )
2017-08-03 17:38:03 +05:30
Nabin Hait
ee5ff805e9
Book expense included in valuation only if perpetual inventory enabled ( #10271 )
2017-08-03 17:37:23 +05:30
Saurabh
33aaebac2b
[fix] encode title and description in payment request ( #10240 )
2017-08-03 11:47:05 +05:30
Nabin Hait
af01f5154b
Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission
...
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-03 10:45:17 +05:30
Nabin Hait
b554f9077c
Update set_write_permission_for_quotation_for_sales_manager.py
2017-08-03 10:44:55 +05:30
Nabin Hait
bfb3de771b
Merge pull request #10255 from tundebabzy/issue-10215
...
Error when creating Bank Entry from Process Payroll (#10215 )
2017-08-03 10:20:31 +05:30
Nabin Hait
21045c456e
Update process_payroll.py
2017-08-03 10:20:10 +05:30
Nabin Hait
5ebb9a0fc7
Merge pull request #10259 from pratu16x7/hotfix
...
[hotfix] website stock not shown due to discount not set
2017-08-03 10:19:13 +05:30
Kanchan Chauhan
1fd17a9a67
[Minor] Country field name should be country
2017-08-03 10:18:43 +05:30
tunde
7663bbadb9
edit Doctypes to use company currency
2017-08-03 00:05:56 +01:00
tunde
4a263c714d
get_party_detail should use default currency of party
2017-08-02 22:26:39 +01:00
pratu16x7
7587b19d1b
[fix] website stock not shown due to discount not set
2017-08-02 22:14:51 +05:30
tunde
919c9db1b0
indicator should be red
2017-08-02 15:19:24 +01:00
Nabin Hait
f5dee777dd
minor fix in applying pricing rule
2017-08-02 19:08:39 +05:30
tunde
3b8b3fe766
Merge branch 'hotfix' into issue-10215
2017-08-02 14:27:56 +01:00
tunde
85adbd7eae
show message if there's no submitted salary slip
2017-08-02 14:20:24 +01:00
tunde
c697526382
except in python 3 compatible style
2017-08-02 14:20:23 +01:00
mbauskar
2dd57acdef
removed merge conflicts
2017-08-02 18:39:04 +05:30
mbauskar
478ffb9ae3
bumped to version 8.7.0
2017-08-02 19:05:51 +06:00
mbauskar
73dc35ddbf
resolved merge conflicts
2017-08-02 18:24:03 +05:30
Rohit Waghchaure
250e964205
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-02 18:23:39 +05:30
mbauskar
ee090a9a3c
Merge branch 'master' into develop
2017-08-02 18:18:14 +05:30
mbauskar
4d49a7f6d1
bumped to version 8.6.6
2017-08-02 18:48:14 +06:00
Makarand Bauskar
ce436b7698
[minor] set description to '' if template description is not available ( #10244 )
2017-08-02 18:16:53 +05:30
rohitwaghchaure
ec9430dae7
[Fix] Default selling settings not fetched on customer quick entry form ( #10243 )
2017-08-02 18:16:13 +05:30
Faris Ansari
578624db1f
Fix column width in GST Tax Breakup ( #10230 )
2017-08-02 17:44:32 +05:30
Vishal Dhayagude
ed0b107a9f
[UI Test] UI test added for Pricing Rule ( #10237 )
...
* [UI Test] UI test added for Pricing Rule
* [mod]minor chages in pricing rule test
* [fix] codacy fixed
2017-08-02 17:31:20 +05:30
Vishal Dhayagude
f9e4893d9d
[UI Test] Test added for Shipping Rule ( #10229 )
...
* [UI Test] Test added for Shipping Rule
* [fix]Travis Failed
2017-08-02 17:16:46 +05:30
Vishal Dhayagude
f1f1b60a62
[UI Test ] Sales Order with tax and discount ( #10225 )
...
* [new] UI Test for Sales Order
* [fix] Codacy fixed
* Update test_sales_order_with_discount_on_grand_total.js
* Update test_sales_order_with_taxes_and_charges.js
2017-08-02 17:15:47 +05:30
Zarrar
78c6e34106
[ui test] student applicant and various actions that can be taken ( #10221 )
...
* msgprint error fixed
* student applicant, various actions and its dependencies
2017-08-02 11:25:49 +05:30
Nabin Hait
9641d5b1f4
Make payment entry button in expense claim and some minor cleanup
2017-08-01 17:38:48 +05:30
Nabin Hait
edba79e8f0
Update utils.py
2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott
38d4be8325
Update manuals. Fix codacy issues
2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott
118ceda46f
Add Payment Entry for Expenses
2017-08-01 17:35:50 +05:30
Vishal Dhayagude
316477b422
[UI Tests] All sales order test in tests folders ( #10211 )
...
* [new] Sales order with_discount, multi_uom, delivery_date added
* [fix] All sales order test in tests folder
2017-08-01 17:16:21 +05:30
Nabin Hait
564e8b74dc
Minor fixing in setting cumulative tax amount
2017-08-01 16:35:22 +05:30
Nabin Hait
4ada637b17
Update taxes_and_totals.js
2017-08-01 16:20:59 +05:30
Kanchan Chauhan
d0c5b3eb07
[URGENT] this is me
2017-08-01 16:02:01 +05:30
Nabin Hait
9b2b42dfc1
Minor fix in bom_stock_qty patch
2017-08-01 11:10:29 +05:30
Makarand Bauskar
317888211a
merged hotfix branch into staging ( #10191 )
...
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )" (#10159 )
This reverts commit 4d2e782e42#10157 )
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160 )
* Set billing hours to 0 in timesheet #9535 (#10139 )
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155 )
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
Nabin Hait
cd95134267
Rounding issue in tax calculation ( #10135 )
...
* Adjust rounding loss of discount in the last item row. Fixes #8952
* Fixed rounding issue in tax calculation. Fixes #8953 , #8952 , #8893 , #6954 , #8910
* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Rushabh Mehta
1fb4abc322
[docs] cleanup
2017-07-31 17:40:17 +05:30
Vishal Dhayagude
95dfe27bf7
[UI Test] Sales Order with multi currency and tax ( #10189 )
...
* [UI Test] Sales Order with multi currency and tax
* [fix]Codacy fixed
* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Rushabh Mehta
4920d73adb
[docs] remove {{docs_base_url}}
2017-07-31 16:41:35 +05:30
Rushabh Mehta
95349fe360
[docs] add headings
2017-07-31 16:21:12 +05:30
Faris Ansari
40d3ad2bb4
Add erpnext-grey.png, add logo in footer ( #10101 )
...
* Add erpnext-grey.png, footer html
* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
mbauskar
892cd615f8
bumped to version 8.6.5
2017-07-31 12:51:35 +06:00
Nabin Hait
495ef67caa
Added delivery date in SO parent form. Fixes #10104 ( #10155 )
...
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Zarrar
35d3190822
[ui test] Setting up school course+program and their dependencies ( #10142 )
...
* setting up course and its dependencies
* rebasing with develop branch
* codacy fix
* added test for Program
* updated test-dada to maintain consistency with future tests
2017-07-31 11:05:52 +05:30
Ameya Shenoy
4e91f28ce5
[ui-testing] added test for production order ( #10138 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* added warehouses required for production order
* [ui-test] added production order test
* debugging travis failure
2017-07-31 11:02:28 +05:30
Rohit Waghchaure
33977827c4
[Fix] Timesheet Company Issue
2017-07-29 14:15:50 +05:30
Nabin Hait
1fcd2b0676
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 21:09:42 +05:30
tundebabzy
41c954b8b3
Set billing hours to 0 in timesheet #9535 ( #10139 )
...
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
2017-07-28 21:05:15 +05:30
Faris Ansari
482331b987
[fix] Default Warehouse not obeying form value ( #10153 )
2017-07-28 20:58:39 +05:30
rohitwaghchaure
e2176b852e
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10160 )
2017-07-28 20:52:02 +05:30
Utkarsh Yadav
8990af458b
[ui test] leave application in HR ( #10151 )
...
* added test for leave application
* minor changes and path added
* travis fixes
* minor changes
2017-07-28 19:37:15 +05:30
Vishal Dhayagude
569011fb21
[UI Test] Test for Product Bundle added ( #10158 )
2017-07-28 19:36:50 +05:30
Britlog
4c7709efbd
Portal breadcrumbs ( #10095 )
2017-07-28 18:54:22 +05:30
Rushabh Mehta
11a3d51774
[test] test_sales_order.py
2017-07-28 17:11:11 +05:30
mbauskar
3b27382013
Merge branch 'master' into develop
2017-07-28 16:03:52 +05:30
mbauskar
2b420f7038
bumped to version 8.6.4
2017-07-28 16:33:52 +06:00
rohitwaghchaure
353af64197
[Fix] Unable to save asset because of float error issue ( #10157 )
2017-07-28 15:55:46 +05:30
Rushabh Mehta
be4fd1100d
[fix] test
2017-07-28 15:54:07 +05:30
Makarand Bauskar
8bccaed35a
Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10148 )" ( #10159 )
...
This reverts commit 4d2e782e42
2017-07-28 15:43:23 +05:30
Rushabh Mehta
8af33a513b
[fix] test
2017-07-28 15:34:20 +05:30
rohitwaghchaure
4d2e782e42
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10148 )
2017-07-28 15:21:22 +05:30
Rushabh Mehta
e16ec0c891
[minor] change docs_base_url
2017-07-28 14:56:59 +05:30
Makarand Bauskar
20f4d7f559
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2
User Permissions Redesign ( #10006 )
...
* [fixes] for user permission
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
bcornwellmott
bab0c5a8a5
Add disable check for Activity Type ( #10120 )
...
* Add disable check for Activity Type
* Add check for disabled in Timesheet
* Codacy fixes
* Fixed bugs
* Restore permissions
2017-07-28 14:32:45 +05:30
Rushabh Mehta
bead70b43a
Docs in website ( #10149 )
...
* [docs] move to erpnext.org
* [docs]
* [minor] add title
2017-07-28 11:44:08 +05:30
Utkarsh Yadav
1c8d8a9720
[ui test] leave type,leave control panel and leave allocation in HR ( #10136 )
...
* changes in attendance
* added test for leave type
* added test for leave control panel
* added test for leave allocation
* codacy fixes
2017-07-28 11:40:29 +05:30
Rushabh Mehta
d50da78f28
[fixes] errors caught on flake8 ( #10126 )
2017-07-28 11:39:01 +05:30
Rohit Waghchaure
120b6c0b3c
UI test cases and documentation
2017-07-28 01:52:10 +05:30
Rohit Waghchaure
5296e3c321
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-27 19:17:05 +05:30
Saurabh
c07741d36f
Merge branch 'master' into staging
2017-07-27 17:50:28 +05:30
Saurabh
8907f1d2c3
Merge branch 'master' into develop
2017-07-27 17:50:27 +05:30
Saurabh
6f9ef5b890
bumped to version 8.6.3
2017-07-27 18:20:27 +06:00
Zarrar
c54510660e
[ui test] Minor files ( #10133 )
...
* added permissions for Administrator user
* updated files
* minor files for future tests
* added entry for all tests
2017-07-27 17:19:06 +05:30
Makarand Bauskar
145393b12f
[hotfix] set the account name in GL entry instead of warehouse ( #10134 )
2017-07-27 16:46:40 +05:30
Makarand Bauskar
9c6e2c3637
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends ( #10127 )
2017-07-27 16:23:57 +05:30
mbauskar
7b764d03c2
Merge branch 'master' into develop
2017-07-27 12:18:15 +05:30
mbauskar
448d919cc1
bumped to version 8.6.2
2017-07-27 12:48:15 +06:00
Vishal Dhayagude
b528411ed1
[ui test]sales and taxes charges template ( #10116 )
2017-07-27 12:15:06 +05:30
Utkarsh Yadav
b8b01928d3
[ui test] employee attendance tool and attendance in HR ( #10112 )
...
* added test for attendance tool
* added test for attendance
* minor changes
* minor changes
* path added in tests.txt
* codacy fixes
2017-07-27 11:49:10 +05:30
tundebabzy
296603a861
auto populate all rows ( #10090 )
2017-07-27 11:47:56 +05:30
tundebabzy
84227a6c54
Employee Loan Should Be Limited To Employee Company ( #10039 ) ( #10093 )
...
* filter employee drop down by company name
* codacy fix
2017-07-27 11:47:03 +05:30
tundebabzy
9281013d51
add transaction date call to get_exchange_rate ( #10109 )
2017-07-27 11:43:32 +05:30
tundebabzy
87ec6a12ef
adds options to currency fields ( #10118 )
2017-07-27 11:38:17 +05:30
rohitwaghchaure
059f99e621
[Fix] Wrong avg. buying rate in the Gross Profit report ( #10110 )
2017-07-27 11:37:30 +05:30
rohitwaghchaure
8579dd1d78
[minor] If customer has removed getting an error ( #10107 )
2017-07-27 11:21:54 +05:30
cclauss
6848708377
old style exception, raise --> new style for Python 3 ( #10082 )
...
* old style raise --> raise() for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style raise --> raise() for Python 3
* old style raise --> raise() for Python 3
* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
Vishal Dhayagude
c67bf5026e
[UI Test] Create tax account in Charts of account ( #10105 )
...
* [new]tax creation added
* [new]path added test.txt
2017-07-27 09:11:08 +05:30
Faris Ansari
fbec103ae7
Remove inline styling, add css classes ( #10077 )
2017-07-26 18:46:13 +05:30
Makarand Bauskar
1d9fd9aa52
[minor][wiz] fix company image alignment ( #10114 ) ( #10117 )
2017-07-26 18:19:41 +05:30
KanchanChauhan
58c9934452
[fix] company graph based on base currency ( #9950 )
2017-07-26 18:17:11 +05:30
Prateeksha Singh
83535811ad
[minor][wiz] fix company image alignment ( #10114 )
2017-07-26 18:11:37 +05:30
KanchanChauhan
7800bd89dc
Added Project Type new doctype to be added as link field for Project Type field in project instead of select field ( #9929 )
2017-07-26 17:55:25 +05:30
Utkarsh Yadav
53b877bd8f
[ui test] Employee in HR ( #10103 )
...
* added test for employee
* names changed
* path added in tests.txt
2017-07-26 16:32:16 +05:30
Utkarsh Goswami
40937083bf
[UI-Test Project] To check a billing cost of a project with multiple tasks ( #10084 )
...
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* updated:
* Updated
* Updated
2017-07-26 16:31:08 +05:30
Makarand Bauskar
d0109a6fc0
[minor] enable all roles and domain before running tests cases ( #10108 )
...
* [minor] enable all roles and domain before running tests cases
* Update utils.py
2017-07-26 16:29:22 +05:30
Utkarsh Yadav
b8a4a584e6
[ui test] test for department, designation, company and leave block list ( #10085 )
...
* added test for required items
* minor fixes for travis
* name changed
* added test for employment type
* travis fixes
2017-07-26 13:14:34 +05:30
Prateeksha Singh
cda6206c1f
[minor][wiz] remove header brand image ( #10016 )
2017-07-26 13:05:48 +05:30
Saurabh
7bdc45eceb
Merge branch 'master' into develop
2017-07-25 18:02:58 +05:30
Saurabh
394dbca0e4
bumped to version 8.6.1
2017-07-25 18:32:58 +06:00
Saurabh
4c1caa7e98
[hot][fix] updated modified date for sales order
2017-07-25 17:35:14 +05:30
Saurabh
dc6e369172
Merge branch 'master' into develop
2017-07-25 16:42:28 +05:30
Saurabh
bb5812cf0f
bumped to version 8.6.0
2017-07-25 17:12:26 +06:00
Saurabh
36645e4e2f
Merge branch 'master' into staging
2017-07-25 16:15:51 +05:30
Saurabh
fb4f320df4
Merge branch 'master' into develop
2017-07-25 16:15:50 +05:30
Saurabh
e7c14fcc3d
bumped to version 8.5.5
2017-07-25 16:45:49 +06:00
Rohit Waghchaure
d62fa84ed9
[Fix] Calendar view for sales order
2017-07-25 15:34:20 +05:30
Rohit Waghchaure
baa937aa52
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:26:01 +05:30
Ameya Shenoy
08450878f1
[ui-test] added test for bill_of_materials ( #10063 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* fixed minor codacy problems
* added minor requested changes
2017-07-25 15:23:58 +05:30
Ashwini Save
2ffe878999
Timeline Title for small resolution Add to knowledge base button. ( #9926 )
...
* Add to Knowledge Base button class updated to hide for mobile view.
* Updated code to avoid multiple occurance of Knowledge Base button while updating comment.
2017-07-25 14:16:48 +05:30
rohitwaghchaure
49a6b4a4fa
[Fix] RFQ list showing to all supplier in the portal ( #10023 )
2017-07-25 14:12:58 +05:30
bcornwellmott
05e51d6c83
Add Get Suppliers dialog ( #10025 )
...
* Add Get Suppliers dialog
* Commonize code, use depends_on
* Update request_for_quotation.js
2017-07-25 14:10:23 +05:30
rohitwaghchaure
4cccdbdbf9
[Fix] Validating price list currency even if price list is not defined ( #10056 )
2017-07-25 14:05:01 +05:30
KanchanChauhan
4b888b95d0
[Minor] Added filter condition to Customer Query ( #10057 )
2017-07-25 14:03:01 +05:30
Zarrar
b5ec8381a6
[UI Tests] School Academic Term test ( #10050 )
2017-07-25 11:46:34 +05:30
Frappe PR Bot
3b128cabb2
[Translation] Updated Translations ( #10047 )
2017-07-25 11:46:16 +05:30
Zarrar
1c6828e5d6
[UI Tests] School Academic Year test ( #10049 )
2017-07-25 11:45:39 +05:30
KanchanChauhan
d65b4b4238
Patch was faling, reload doc was missing ( #10072 )
2017-07-25 11:39:46 +05:30
ci2014
13abada526
Update email-account.md ( #10066 )
...
* Update email-account.md
Add information to conditional import
* Add files via upload
2017-07-25 11:06:03 +05:30
tundebabzy
de54f3019f
use api to get default cost center for chosen company ( #10067 )
2017-07-25 11:05:07 +05:30
bcornwellmott
d023d9a0bd
Add RFQ email sent check ( #10068 )
...
* Add RFQ email sent check
* remove blankspace
* Removed debugger
2017-07-25 11:03:12 +05:30
Vishal Dhayagude
edb2749dfd
Timesheet web ( #10037 )
...
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Makarand Bauskar
fcaf313c0f
[minor] make-demo fixes for manufacturing domain ( #10029 )
2017-07-25 10:49:35 +05:30
Makarand Bauskar
dfc5a454b3
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report ( #10028 )
2017-07-25 10:48:43 +05:30
bcornwellmott
1c32f5ace9
Whitelist method for adding production orders ops ( #9997 )
2017-07-24 22:43:44 +05:30
bcornwellmott
96381da547
Supplier Scorecard ( #9294 )
...
* Initial start of scorecard docs
* Got basic functionality working
* Fixed doc names and added key functions
* Basic functional version minus Actions
* Hide scorecard docs until functional
* Created supplier scorecard documentation
* Added default variables and standings. Added restrictions for PO + RFQ
* Automatic daily scorecard creation + on save
* Added warning for PO nd RFQs
* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo
* Added tests, fixed codacy formatting, small improvements
* Fixed test bug w/ criteria. Codacy cleanup
* Fixed codacy issues. Fixed sticky criteria
* Fixed bug with period search. Remove blank variable child.
* Updated docs, automatically add criteria and standings, clean up period create message
* Uncommented test, set docs to beta
* Fix for nabinhait review
* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Ameya Shenoy
91b2833708
[ui-tests] added workstation and operation ( #10044 )
...
* [ui-test] workstation and operation testing added
* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
2017-07-24 14:34:30 +05:30
Utkarsh Yadav
20a862a6b9
[ui test] holiday list and branch in HR ( #10045 )
...
* added test for holiday list
* codacy fixes
* added check for all days in list
* added test for branch
* codacy fixe
* minor fixes
2017-07-24 14:33:42 +05:30
tundebabzy
65656ec2df
hide salution and gender if company type is Company ( #10040 )
2017-07-24 11:32:26 +05:30
Makarand Bauskar
9306aff1bb
[minor] moved the patch to v8_5 and other minor fixes ( #10012 )
...
* Quotation and Supplier Quotation Route and Permission Edits
* [minor] moved the patch to v8_5 and other minor fixes
2017-07-21 15:19:47 +05:30
Ameya Shenoy
73f969fd7f
[ui-test] manufacturing item creation testing ( #10009 )
2017-07-21 14:22:08 +05:30
Prateeksha Singh
283d5550e6
[fix] set sales base field as base_grand_total ( #10008 )
2017-07-21 14:21:35 +05:30
Rushabh Mehta
dda608dd00
[fix] update_company_current_month_sales in company.py ( #10005 )
2017-07-21 11:58:14 +05:30
Faris Ansari
e355f99786
Remove ellipsis in title and description ( #9992 )
2017-07-20 17:51:19 +05:30
mbauskar
6c8d4678db
Merge branch 'master' into develop
2017-07-20 16:49:30 +05:30
mbauskar
ea50c9d1be
bumped to version 8.5.4
2017-07-20 17:19:30 +06:00
Rushabh Mehta
35da7d1fb4
[minor] we buy is also checked by default
2017-07-20 15:58:20 +05:30
Rushabh Mehta
ced14cc789
[fix] setup-wizard
2017-07-20 15:55:54 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
mbauskar
a919be111a
bumped to version 8.5.3
2017-07-20 14:46:57 +06:00
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
rohitwaghchaure
79d6266c7b
[Fix] Unable to create production order from the sales order for the bundle items ( #9976 )
2017-07-20 10:35:51 +05:30
tundebabzy
11d23f84d7
Can't set Start and End Dates in Salary Slip ( #9513 ) ( #9944 )
...
* remove trigger from end_date
* adds new function `get_end_date`:
- it tries to calculate the appropriate end date for a given frequency
- returns an empty string if frequency is 'biweekly'
- adds test cases
* changes logic in `set_start_end_dates`:
- if start_date is empty in form, call process_payroll.get_start_end_dates
- else, call process_payroll.get_end_date
* `get_end_date` should return a dict
* changed "biweekly" to "bimonthly"
* change the behaviour of process payroll start and end date:
- when payroll frequency is changed, change start/end date as usual
- if start date is manually changed, use the frequency to calculate the end date
* clean up
* further cleanup
* in `get_end_date`, if `frequency` isn"t given, "monthly"
* remove end_date from cscript and introduce `set_end_date`
* fix tests
* removed whitespaces
2017-07-20 10:33:03 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Makarand Bauskar
ac9b1332d2
[minor] set no copy to sales goal fields ( #9956 )
2017-07-19 18:55:12 +05:30
Doridel Cahanap
7b021e0fac
Show Expected End Date in Project List View ( #9964 )
2017-07-19 18:21:31 +05:30
KanchanChauhan
d6dd25a666
Added indicators on Project Tasks ( #9952 )
2017-07-19 18:06:52 +05:30
rohitwaghchaure
f86100a734
[Fix] Calendar view not working for leave application ( #9963 )
2017-07-19 17:09:30 +05:30
_JG_
96bb6099d6
[fix] correctly choice 'Credit Limit' ( #9932 )
...
* [fix] correctly choice 'credit limit'
If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings
* Update party.py
* [fix] correctly choice 'Credit Limit'
2017-07-19 10:27:09 +05:30
Nabin Hait
e6c2ae3682
Merge pull request #9940 from rmehta/workstation-form
...
[ux] workstation form layout
2017-07-19 10:24:28 +05:30
Nabin Hait
8d56f2959b
Merge pull request #9942 from bcornwellmott/bix_bom_qty
...
Update qty from stock_qty before validate materials
2017-07-19 10:22:00 +05:30
Rushabh Mehta
d2d24554b3
[ux] workstation form layout
2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott
c7d2bc67e8
Update qty from stock_qty before validate materials
2017-07-18 08:56:25 -07:00
Rushabh Mehta
1283f6308d
[fix] company graph based on base currency
2017-07-18 18:22:16 +05:30
mbauskar
d36c136fc6
Merge branch 'master' into develop
2017-07-18 16:38:24 +05:30
mbauskar
75e65e7079
bumped to version 8.5.2
2017-07-18 17:08:23 +06:00
Saurabh
7f95d587b2
[fix] escape company filter ( #9924 )
2017-07-18 16:09:34 +05:30
Makarand Bauskar
75b145fe2c
[hotfix] used frappe.db.set value instead of frappe.set_value ( #9923 )
2017-07-18 16:05:52 +05:30
Nabin Hait
bc3acdd0ba
Merge pull request #9510 from tundebabzy/issue-9166
...
Unable to create Manual Depreciation of Asset due to Error #9166
2017-07-18 15:44:18 +05:30
mbauskar
823b3ca540
bumped to version 8.5.1
2017-07-18 15:40:19 +06:00
Makarand Bauskar
5e75e3ba03
[hotfix] set_restrict_to_domain_for_module_def patch fixes ( #9921 )
2017-07-18 15:09:30 +05:30
mbauskar
113df55e64
Merge branch 'develop'
2017-07-18 13:07:01 +05:30
mbauskar
3e4b2743c6
bumped to version 8.5.0
2017-07-18 13:37:00 +06:00
Nabin Hait
338c28e78e
Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn
...
[Fix] Sales invoice serial no validation issue
2017-07-18 13:05:50 +05:30
Rohit Waghchaure
7e14996995
[Fix] Sales invoice serial no validation issue
2017-07-18 12:59:55 +05:30
Makarand Bauskar
6e30f04181
[domainify] patch to set the restrict to domain for module_def ( #9912 )
2017-07-18 12:30:57 +05:30
Nabin Hait
4a10f18ee3
Merge pull request #9913 from mbauskar/quotation
...
[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)
2017-07-18 12:20:47 +05:30
Nabin Hait
f37d43d0c1
Remove newline from serial no values
2017-07-18 12:15:16 +05:30
pratu16x7
aea60f349f
[minor] default qty 0, fixes frappe/erpnext#9880
2017-07-18 12:15:16 +05:30
pratu16x7
90bd5681d1
[batch modal] bind serial_no field in onchange
2017-07-18 12:15:16 +05:30
mbauskar
30e03cc4c8
[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)
2017-07-18 11:45:53 +05:30
Nabin Hait
4c40a416e6
Merge pull request #9900 from frappe/fixes_9899
...
[fix] #9899
2017-07-18 11:17:45 +05:30
Nabin Hait
3020c8086c
Update stock_balance.py
2017-07-18 11:17:32 +05:30
Makarand Bauskar
c446bf6117
Merge branch 'develop' into rejected_expense_claim_issue
2017-07-18 10:54:13 +05:30
Rushabh Mehta
660de515b5
[fix] filters for calendars frappe/erpnext#9850 ( #9870 )
2017-07-18 10:50:30 +05:30
Prateeksha Singh
e012e24423
Sales Goal by Company ( #9723 )
...
* [sales goal] in company; dashboard, graph, notifs, wiz
* [test] target notifications
* cache past year monthly sales of every company daily, patch
* [minor] query fixes
* update sales goal docs
2017-07-18 10:35:12 +05:30
Nabin Hait
22e82dff20
Removed a deprecated function call
2017-07-17 20:28:30 +05:30
tunde
78d2f542d0
code fix as per review
2017-07-17 15:00:45 +01:00
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
tunde
1ee534889f
Revert "adds if statement for reference_type === "Asset""
...
This reverts commit c7e3a09cfb
2017-07-17 13:27:59 +01:00
Frappe PR Bot
fa04236c8d
[Translation] Updated Translations ( #9898 )
2017-07-17 17:50:36 +05:30
pawan
36025468a1
[fix] #9899
2017-07-17 17:28:44 +05:30
Rohit Waghchaure
0e376a464b
test cases
2017-07-17 16:47:01 +05:30
Rohit Waghchaure
8333b5754b
[Fix] Expense claim status issue
2017-07-17 16:38:20 +05:30
Rushabh Mehta
dab1172a18
[refactor] party.js get_party_details ( #9888 )
2017-07-17 15:31:17 +05:30
rohitwaghchaure
ea4497c8d2
Renamed the report Support Hours to Support Hours Distribution ( #9874 )
2017-07-17 14:55:42 +05:30
rohitwaghchaure
b994b3dcda
Allow to select asset account in the payable in the expense claim for imprest management ( #9891 )
2017-07-17 14:33:33 +05:30
Makarand Bauskar
805a41d06c
[minor] fixed the set_portal_settings patch ( #9890 )
2017-07-17 13:44:56 +05:30
Nabin Hait
e06526ffff
Add indexes in some transaction doctypes ( #9889 )
2017-07-17 13:28:27 +05:30
Nabin Hait
2df7db0346
Merge pull request #9884 from mbauskar/patch-fixes
...
[hotfix] fixed GST code for Uttarakhand
2017-07-17 13:04:54 +05:30
Narciso E. Núñez Arias
c9877c5c1e
Translation of ERPNext manual .md files ( #9872 )
...
* Translate Do I Need An ERP page
* Translate getting started with erpnext Page
* Translate Implementation Strategy Page
* Translate Spanish Index page
* Translate Flow Chart of transactions page
* Translate open source page
* Translate The Champion Page
* Fix spanish translation on Index page
2017-07-17 12:10:47 +05:30
strixaluco
372a881d8c
Make 'Financial Year' translatable in Setup wizard ( #9879 )
2017-07-17 12:06:25 +05:30
mbauskar
71b5250cbd
[hotfix] fixed the state code for Uttarakhand
2017-07-16 21:28:39 +05:30
mbauskar
3ceebaec3f
Merge branch 'master' into develop
2017-07-14 17:47:07 +05:30
mbauskar
30e987a835
bumped to version 8.4.3
2017-07-14 18:17:07 +06:00
Makarand Bauskar
087da2e571
Fixed patch ( #9862 ) ( #9871 )
2017-07-14 17:44:26 +05:30
Makarand Bauskar
ad7eb9d03c
[minor] check mode_of_payment in Payment entry ( #9869 )
...
* [minor] don't trigger the expense type trigger if value is not set
* [minor] check if account is selected or not in Payment Entry
* [minor] check mode_of_payment in Payment entry
2017-07-14 17:31:36 +05:30
Nabin Hait
35d0de8276
Merge pull request #9858 from mbauskar/expense-claim
...
[minor] don't trigger the expense type trigger if value is not set
2017-07-14 15:28:34 +05:30
Rushabh Mehta
812853aa86
[refactor] account.js to new style ( #9787 )
...
* [fix] conference site update
* [test] run all js tests
2017-07-14 15:28:04 +05:30
KanchanChauhan
319c58266b
Changes Quotes to Quotations in website sidebar because that seems more legit ( #9825 )
2017-07-14 14:30:42 +05:30
rohitwaghchaure
dcf10ee4f6
Fixed patch ( #9862 )
2017-07-14 13:02:38 +05:30
mbauskar
1394a6557d
[minor] check mode_of_payment in Payment entry
2017-07-14 12:09:17 +05:30
mbauskar
00e825a8af
[minor] check if account is selected or not in Payment Entry
2017-07-14 11:38:39 +05:30
mbauskar
ed89a83584
[minor] don't trigger the expense type trigger if value is not set
2017-07-14 11:21:27 +05:30
Faris Ansari
2c5b3e83f5
New design for daily work summary ( #9844 )
...
* New design for daily work summary
* Update tests
2017-07-13 18:37:18 +05:30
Rushabh Mehta
8e2531e2bb
Update Test Runner to run tests one by one ( #9843 )
...
* [update] tests as per new api
* [test] unset test_quotation.js
* [test] unset test_quotation.js
* [test] unset test_quotation.js
* [test] unset test_quotation.js
2017-07-13 18:22:20 +05:30
Nabin Hait
d5dd9f1706
Merge pull request #9839 from rmehta/regional-decorators
...
[feature] override a function regionally by adding a decorator
2017-07-13 17:51:29 +05:30
mbauskar
ae20748dec
bumped to version 8.4.2
2017-07-13 16:46:20 +06:00
Rushabh Mehta
3df2c9421a
[fix] setup wont be called if declared inside setup
2017-07-13 16:11:54 +05:30
Rushabh Mehta
393becce0b
[fix] name decorator as allow_regional
2017-07-13 15:49:37 +05:30
mbauskar
efaf9f59db
bumped to version 8.4.1
2017-07-13 15:44:29 +06:00
Rushabh Mehta
8f2e21def2
[feature] override a function regionally by adding a decorator
2017-07-13 15:07:51 +05:30
Rushabh Mehta
7231f29e78
[feature] override a function regionally by adding a decorator
2017-07-13 15:00:56 +05:30
Saurabh
e74e4b18c7
[patch][fix] update gst_state only if company country is india
2017-07-13 14:38:43 +05:30
mbauskar
05d62127d0
bumped to version 8.4.0
2017-07-13 14:35:51 +06:00
Nabin Hait
7549a83b9b
Merge pull request #9801 from manassolanki/refractor-report
...
changes in the assessment report
2017-07-13 13:46:19 +05:30
rohitwaghchaure
c3153655eb
Fixed patch create_warehouse_nestedset ( #9833 )
2017-07-13 12:17:12 +05:30
Makarand Bauskar
96488b0f34
[patch] removed create company address patch ( #9832 )
2017-07-13 12:16:28 +05:30
Nabin Hait
1a60931435
Added SAC codes and 2/4 digit HSN codes, regional setup can be called multiple times ( #9820 )
2017-07-13 12:16:04 +05:30
Makarand Bauskar
8f507a984e
[minor] check if the company is selected or not before triggering get_bank_cash_account ( #9830 )
...
* [minor] check if the company is selected or not before triggering get_bank_cash_account
* [minor] check if production order is available
* [minor] fixed codacy errors
2017-07-13 11:44:29 +05:30
Nabin Hait
57d3cecd68
Merge pull request #9811 from rohitwaghchaure/pricing_rule_issue_for_discount
...
[Fix] Manual discount is not applying in the transaction if discount amount is zero in the pricing rule
2017-07-13 11:14:53 +05:30
Nabin Hait
7312186c76
Set corrected states list in GST State field's options
2017-07-13 10:41:15 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
rohitwaghchaure
c1a1e62c0d
[Fix] Data not showing in the heatmap of the customer ( #9819 )
2017-07-12 18:57:23 +05:30
Rohit Waghchaure
b12f2109b5
[Fix] Manual discount is not applying on the pricing rule if discount amount is zero in the pricing rule
2017-07-12 18:02:02 +05:30
Manas Solanki
a13c6a1bef
codacy cleanup
2017-07-12 17:49:59 +05:30
Manas Solanki
79ed58fd36
chnages in the assessment report
2017-07-12 17:49:59 +05:30
rohitwaghchaure
860144feb7
[Fix] User not able to search an Item if description is null in the item ( #9793 )
2017-07-12 15:01:56 +05:30
Makarand Bauskar
1efb05233c
[minor] don't trigger source_warehouse if item_code is not set in Production Order ( #9806 )
2017-07-12 14:53:14 +05:30
Makarand Bauskar
ef8d6dc8f8
[minor] ingore mandatory while auto closing issues and opportunity ( #9783 )
2017-07-12 14:52:32 +05:30
Nabin Hait
79c2191aa3
[fix] Don't add newline at the end, onchange of serial_no and filter warehouse based on company and is_group ( #9809 )
2017-07-12 14:10:43 +05:30
Aditya Duggal
4e1a3c1d58
Changed state codes and added state
...
-Andaman 35 added
-UP changed to 09 from 35
-Uttrakhand changed to 05 from 36
2017-07-12 13:40:11 +05:30
Nabin Hait
fb8e59234b
Merge pull request #9652 from bcornwellmott/sq_lead_time
...
Added lead time field to supplier quotation
2017-07-11 23:39:27 +05:30
Umair Sayed
31af0849db
Update navigation.md ( #9798 )
2017-07-11 21:07:03 +05:30
Frappe PR Bot
bfdb726072
[translation] translation updates ( #9788 )
2017-07-11 15:20:11 +05:30
mbauskar
b2aa867b70
bumped to version 8.3.6
2017-07-11 13:32:14 +06:00
Makarand Bauskar
30f2bcbccc
[hotfix] allow only 5 character in company_abbr field in setup wizard ( #9779 )
2017-07-11 12:36:57 +05:30
Prateeksha Singh
7d885432eb
[wiz] add user slide, enforce first entry, static labels ( #9744 )
2017-07-11 12:36:34 +05:30
Nabin Hait
3b5f774144
Merge pull request #9410 from manassolanki/patch-company
...
Patch for the PR 8754, fixes #9011
2017-07-11 11:35:29 +05:30
Nabin Hait
3a200bbc44
Update create_address_doc_from_address_field_in_company.py
2017-07-11 11:34:27 +05:30
Nabin Hait
2bedca04ae
Merge pull request #9750 from rohitwaghchaure/taxable_amount_issue
...
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-11 11:16:56 +05:30
Manas Solanki
1a0536bff4
changes as per review
2017-07-11 11:16:16 +05:30
Manas Solanki
cdba021802
patch for removing the address field from company and creating address doc, fixes #9011
2017-07-11 11:16:16 +05:30
Shivam Mishra
3fe5ecc611
Added Lead fixture, Added test for Lead, Opportunity ( #9607 )
...
* Added fixtures for Address and Contact
* Fixed formatting errors
* Added Test for terms, Added Tax and Terms fixture
* Add tests for tax
* Added Test for Print Format
2017-07-11 10:33:07 +05:30
Rohit Waghchaure
296fbfeaac
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-10 23:06:49 +05:30
Rushabh Mehta
4a7b4efbec
[tests] update travis.yml to run ui-tests ( #9748 )
...
* [tests] update travis.yml to run ui-tests
* [tests] update travis.yml to run ui-tests
* [test] fix item_group.py
* [test] fix item_group.py
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] no scheduled jobs for tests
* [check] daily work summary fails?
* [check] daily work summary fails?
2017-07-10 23:00:01 +05:30
Ben Cornwell-Mott
b1f0fd4ac3
Lead time matches Item master
2017-07-10 09:09:29 -07:00
Nabin Hait
f7d2a59c18
Merge pull request #9538 from sagarvora/fix-bom-issue
...
[minor] fix bom price resetting on validation
2017-07-10 20:41:16 +05:30
Nabin Hait
0ac8542eaa
Merge pull request #9772 from tundebabzy/issue-9595
...
Wrong Exchange Rate when making payment against Journal Entry (#9595 )
2017-07-10 19:12:48 +05:30
Nabin Hait
c8b6d3badb
Merge pull request #9713 from manassolanki/stud-dashb
...
changes in the student dashboard
2017-07-10 19:10:57 +05:30
Nabin Hait
cdf4320b3b
Merge pull request #9673 from rohitwaghchaure/serial_no_sales_return_issue
...
Remove sales invoice from serial number while making sales return entery using delivery note
2017-07-10 19:04:30 +05:30
Nabin Hait
5b2d3222f3
Merge pull request #9710 from rohitwaghchaure/sales_invoice_dn_link_revert
...
Revert sales invoice dn link issue
2017-07-10 18:47:38 +05:30
Manas Solanki
5d202ca31a
change in the student type
2017-07-10 18:40:53 +05:30
Nabin Hait
7088db9e1f
Merge pull request #9773 from mbauskar/docs
...
[docs] corrected the filename from sms_setting2 -> sms_settings2
2017-07-10 18:17:28 +05:30
Nabin Hait
ec344ffa96
Merge pull request #9761 from mbauskar/depends-on
...
[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field
2017-07-10 18:16:15 +05:30
mbauskar
a52e726b6b
[docs] corrected the filename from sms_setting2 -> sms_settings2
2017-07-10 18:11:32 +05:30
Nabin Hait
cf82c3828e
Merge pull request #9769 from manassolanki/payment-entry
...
frappe call if posting date is defined
2017-07-10 17:57:26 +05:30
Nabin Hait
6fcfbaa1f9
Merge pull request #9766 from nabinhait/migration_fixes
...
minor fixes while upgrading an old instance
2017-07-10 17:45:25 +05:30
Nabin Hait
a6c733d06c
Merge pull request #9753 from rohitwaghchaure/budget_cost_center_issue
...
[Fix] Budget against the field in the validation message
2017-07-10 17:45:02 +05:30
tunde
46ef26df71
treat use case where Journal entry is contained in outstanding_invoices in get_outstanding_reference_documents function
2017-07-10 13:05:29 +01:00
Manas Solanki
99d571a786
frappe call if posting date is defined
2017-07-10 17:33:27 +05:30
Rohit Waghchaure
e3ae600277
[Fix] Budget against the field in the validation message
2017-07-10 17:06:54 +05:30
Nabin Hait
dd7a723214
minor fixes while upgrading an old instance
2017-07-10 16:41:59 +05:30
mbauskar
ccaf36a00f
[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field
2017-07-10 16:24:24 +05:30
Manas Solanki
101a021f7b
added student type in program enrollment and changes in the student dashboard
2017-07-10 16:21:44 +05:30
Nabin Hait
68ed0488a3
Merge pull request #9757 from mbauskar/breadcrumb-fixes
...
[hotfix] check if the item group exist or not
2017-07-10 15:32:52 +05:30
mbauskar
75a233b472
[hotfix] check if the item group exist or not
2017-07-10 14:36:42 +05:30
Nabin Hait
5a174d61bc
Merge pull request #9754 from creamdory/develop
...
Added Quotation as Standard Sidebar Menu
2017-07-10 14:13:35 +05:30
creamdory
7a2815299e
Added Quotation as Standard Sidebar Menu
2017-07-10 16:09:03 +08:00
Manas Solanki
195d2b577f
add few details in the student log ( #9670 )
2017-07-10 12:29:46 +05:30
Britlog
8c85562ceb
Breadcrumbs management ( #9544 )
2017-07-10 12:14:05 +05:30
Manas Solanki
77aa4762b8
don't request another ajax call if one is pending ( #9620 )
2017-07-10 12:12:16 +05:30
Nabin Hait
097da8cc89
bumped to version 8.3.5
2017-07-08 14:25:41 +06:00
Nabin Hait
1d52a4df22
Merge pull request #9732 from adityaduggal/gstin_NA
...
First 2 digit validation would disregard NA values
2017-07-08 13:52:35 +05:30
Nabin Hait
cd61a20fb4
Update utils.py
2017-07-08 13:52:13 +05:30
Aditya Duggal
0e285265b1
First 2 digit validation would disregard NA values
2017-07-08 13:35:01 +05:30
Nabin Hait
b866fcf14f
Finish prod order when skipped material transfer
2017-07-08 12:57:13 +05:30
Manas Solanki
3d190a15ab
changes in the student dashboard
2017-07-07 17:29:29 +05:30
mbauskar
7b5ca3e494
bumped to version 8.3.4
2017-07-07 17:42:36 +06:00
Rohit Waghchaure
8f2c8f6e9d
Revert sales invoice dn link issue
2017-07-07 17:07:59 +05:30
Nabin Hait
76c5924cbe
Merge pull request #9699 from manassolanki/productn
...
frappe call only when there is item in production order
2017-07-07 15:48:37 +05:30
Rohit Waghchaure
9589527784
Fixed the issue Serial No serial no not found
2017-07-07 15:34:28 +05:30
Nabin Hait
dba3f0048b
Merge pull request #9702 from mbauskar/installation-note
...
[hotfix] fixed the customer address set filter on Installation Note
2017-07-07 15:28:23 +05:30
mbauskar
3f6a5b2539
[hotfix] fixed the customer address set filter on Installation Note
2017-07-07 15:24:01 +05:30
Manas Solanki
cf7f72e586
frappe call only when there is item
2017-07-07 15:09:57 +05:30
mbauskar
5cf3868d03
bumped to version 8.3.3
2017-07-07 14:36:45 +06:00
Nabin Hait
1b36336fc3
Added new option in invoice_copy, made state_number read_only ( #9695 )
...
* Added new option in invoice_copy, made state_number read_only
* removed the trailing whitespace
2017-07-07 14:05:33 +05:30
mbauskar
7b8d366e3a
bumped to version 8.3.2
2017-07-07 14:11:45 +06:00
rohitwaghchaure
a29442d6bf
[Fix] Setup wizard translation ( #9693 )
2017-07-07 13:40:13 +05:30
rohitwaghchaure
bbe16c80ff
[Fix] Setup wizard translation issue ( #9692 )
2017-07-07 13:27:15 +05:30
Nabin Hait
4e21f11864
Merge pull request #9690 from rmehta/additional-discount-fix
...
[fix] reset flag after promise
2017-07-07 13:26:14 +05:30
Rushabh Mehta
19d52dc503
[fix] remove extra flag
2017-07-07 13:23:23 +05:30
Nabin Hait
8b486b0f28
Fixed state code of WB and allowed invoice_copy to edit after submit
2017-07-07 13:14:25 +05:30
Rushabh Mehta
6705ab3eaf
[fix] discount setting multiple times
2017-07-07 13:14:08 +05:30
Rushabh Mehta
233a19a373
[fix] reset flag after promise
2017-07-07 13:06:29 +05:30
Nabin Hait
fbb5945ff3
Fixed itemised tax calc to fix pos loading
2017-07-07 12:58:22 +05:30
Nabin Hait
7773ee8960
Sales invoice dashboard, multiple letter head in report and email alert docs
2017-07-07 12:49:05 +05:30
Nabin Hait
29b74b90c8
bumped to version 8.3.1
2017-07-06 23:45:28 +06:00
Nabin Hait
e927b81292
Update production_order.js
2017-07-06 23:11:54 +05:30
Makarand Bauskar
88a37c17a6
[hotfix] commit after every 200 production orders ( #9674 )
2017-07-06 19:13:09 +05:30
Rohit Waghchaure
934e69fe0b
Remove sales invoice from serial number while making sales return entery using delivery note
2017-07-06 18:19:18 +05:30
Nabin Hait
5fe7f6c3fd
Invoice copy is in the center in gst print format
2017-07-06 17:51:05 +05:30
Nabin Hait
d59819d9bb
Date format issue fixed in setup wizard
2017-07-06 16:12:59 +05:30
mbauskar
7699b5e92a
bumped to version 8.3.0
2017-07-06 16:42:02 +06:00
Nabin Hait
b5d765d19a
Merge pull request #9669 from rohitwaghchaure/sales_invoice_serial_no_revert
...
Revert sales invoice serial no issues
2017-07-06 16:07:46 +05:30
Rohit Waghchaure
6d03790b44
Revert sales invoice serial no issues
2017-07-06 15:58:50 +05:30
Nabin Hait
3638250f5d
Merge pull request #9641 from manassolanki/att-report
...
show inactive students in the monthly attendance report
2017-07-06 15:53:16 +05:30
Nabin Hait
7bf192e46a
Merge pull request #9526 from manassolanki/validate-criteria
...
validate the duplicate assessment criteria
2017-07-06 15:47:10 +05:30
Nabin Hait
fa351f4bdf
Merge pull request #9433 from tundebabzy/issue-9424
...
Errors due to a single quote in Supplier's name #9424
2017-07-06 15:22:16 +05:30
Nabin Hait
f3f0dfef2a
Invoice copy, state code in gst print format, hsn code in other sales/purchase docs ( #9658 )
...
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs
* Formatted Net Amount in item-tax-breakup
* GST print format fixes
* removed trailing whitespace
* removed trailing whitespace
2017-07-06 14:49:34 +05:30
rohitwaghchaure
5d5a81f375
Fixed patch create_warehouse_nestedset ( #9656 )
2017-07-06 13:03:11 +05:30
Nabin Hait
02c8607d04
Production Order Documentation for Required Items table ( #9647 )
2017-07-06 11:28:07 +05:30
Makarand Bauskar
ddd4845420
[hotfix] setup wizard, complete_setup fixes ( #9654 )
...
* [hotfix] setup wizard, complete_setup fixes
* Update utils.py
* Update utils.py
2017-07-06 11:09:34 +05:30
Ben Cornwell-Mott
19d9381197
Added lead time field to supplier quotation
2017-07-05 13:17:13 -07:00
Rushabh Mehta
63b06420e1
[fix] setup wizard dates ( #9646 )
2017-07-05 17:56:04 +05:30
Makarand Bauskar
bf66d7e041
[minor] setup wizard dates to yyyy-mm-dd format ( #9642 )
2017-07-05 17:26:34 +05:30
Manas Solanki
fc85768685
show inactive students in the monthly attendance reoprt
2017-07-05 16:35:47 +05:30
Nabin Hait
37c784eb3a
Updated modified in bom doctypes
2017-07-05 16:09:23 +05:30
Makarand Bauskar
a54eb7d022
[minor] added change log for v8.3.0 ( #9629 )
2017-07-05 15:36:38 +05:30
Makarand Bauskar
48af4289d3
Revert "[enhance] Provision to set the currency in the pricing rule for the price" ( #9636 )
2017-07-05 15:17:02 +05:30
Rushabh Mehta
03c30a7f92
[minor] throw name error if group matches with name, for setup wizard to nicely catch the exception
2017-07-05 15:12:07 +05:30
Nabin Hait
949a920022
Production Order Enhancements ( #9432 )
...
* Production Order Enhancements
- Show required items child table
- Source warehouse for each raw materials, in Pro Order Item and BOM Item table
- Group warehouse allowed for source and wip warehouse
- Patch to populate required items, to fix status and reserved qty for stopped pro order
- Cleaned up existing codes
- Test cases
* Set available qty in source and wip warehouse
* minor fix in bom query naming
* Minor Fixes
* Reload BOM doctypes in patch
2017-07-05 13:55:41 +05:30
Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
mbauskar
b66fb9a4c0
Merge branch 'master' into develop
2017-07-05 11:25:15 +05:30
mbauskar
4b7a30b527
bumped to version 8.2.4
2017-07-05 11:55:14 +06:00
Doridel Cahanap
5ad4a6e161
Total Stock Summary ( #9465 )
...
* Total Stock Summary
* indentation fixes and removed the for loop
* minor fixes in total stock summery report
2017-07-05 10:49:09 +05:30
rohitwaghchaure
10a4a13e5e
Remove gst reports for non indian accounts ( #9553 )
...
* remove gst reports for non indian accounts
* [Fix] GSN code auto name
2017-07-04 16:45:29 +05:30
Frappe PR Bot
3ceab64bfa
[translation] translation updates ( #9611 )
2017-07-04 16:08:14 +05:30
tundebabzy
6015f0f2ec
Inspection required before delivery isn't working for item variants ( #9362 )
...
* makes `copy_attributes_to_variant` to not ignore "Table"
* fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant`
* adds test case - tables in templates should be copied to variants
* [ci] use deprecated trusty build for now
2017-07-04 15:43:02 +05:30
rohitwaghchaure
e5ca48a76a
[fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice ( #9593 )
2017-07-04 10:54:23 +05:30
rohitwaghchaure
3e4bcfe2d8
[Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' ( #9585 )
...
* [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause'
* escaped company name in get_opening_accounts
2017-07-04 10:49:37 +05:30
Prateeksha Singh
5e4c8ecd62
Setup wizard refactor ( #9441 )
...
* cleaned up slides, yet to decide on master data
* remove item_count
* [fix] refresh slides on domain bug
* UI test
* set header image here in ERPNext
* [minor] lint checks
* [wiz] change autofilled fiscal year format
* [minor] fixed date format to dd-mm-yyyy if fiscal year is not available for country
2017-07-03 18:23:57 +05:30
Makarand Bauskar
11df066ed0
Merge pull request #9586 from Arundhatii/28June
...
Added help page for Global Search and updated old images #9241
2017-07-03 16:24:39 +05:30
Makarand Bauskar
87f2848aeb
resolved conflicts
2017-07-03 16:24:01 +05:30
Makarand Bauskar
12450fa473
Merge pull request #9558 from mbauskar/domainify-school
...
[domainify] Domainification for the Education Domain
2017-07-03 16:17:21 +05:30
Frappe
67bbcf6932
Resolved conflicts in index.md
2017-07-03 16:00:07 +05:30
Frappe
79918c66c2
Deleted old Images and added Global Search Help page
2017-07-03 15:58:14 +05:30
Makarand Bauskar
960208bae0
Merge pull request #9426 from tundebabzy/issue-9096
...
Gross Profit Does not display Reversal of sales invoice #9096
2017-07-03 15:23:21 +05:30
Makarand Bauskar
1bad1fcc00
Merge pull request #9452 from faztp12/develop
...
Customer Query include Search fields
2017-07-03 15:20:23 +05:30
Rushabh Mehta
43ef4e9047
Added first UI tests ( #9532 )
...
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
2017-07-03 11:53:07 +05:30
mbauskar
a06a600d0a
Merge branch 'master' into develop
2017-07-01 14:16:46 +05:30
mbauskar
af9d3a4db6
bumped to version 8.2.3
2017-07-01 14:46:46 +06:00
Makarand Bauskar
f39a9f1c5b
Merge pull request #9562 from mbauskar/gst-hsn-code
...
[minor] fix autoname for GST HSN Code (#9536 )
2017-07-01 14:15:18 +05:30
Sagar Vora
067991ee30
[minor] fix autoname for GST HSN Code ( #9536 )
2017-07-01 14:14:14 +05:30
Makarand Bauskar
1589ada04d
Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency
...
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-30 18:58:30 +05:30
mbauskar
ee368221cf
[domainify] Domainification for schools doctype
2017-06-30 17:58:57 +05:30
Charles-Henri Decultot
53de2f1b57
Translation correction in P&L report ( #9436 )
2017-06-30 16:45:11 +05:30
mbauskar
22aaf0cbd0
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
2017-06-30 16:43:25 +05:30
Sagar Vora
8ebc0df65f
[minor] fix autoname for GST HSN Code ( #9536 )
2017-06-30 16:42:26 +05:30
Makarand Bauskar
4095915bff
Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr
...
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-30 16:02:31 +05:30
Makarand Bauskar
abe8e2ecce
Merge pull request #9533 from rohitwaghchaure/total_amount_issue
...
[minor] Total amount not showing value in bank reconcillation
2017-06-30 14:50:23 +05:30
Makarand Bauskar
b053674781
Merge pull request #9534 from manassolanki/report
...
Course wise assessment result tool
2017-06-30 14:47:46 +05:30
Manas Solanki
bb68f8ca01
cleanup for the assessment report and added chart
2017-06-30 12:22:51 +05:30
mbauskar
0407cb0d92
bumped to version 8.2.2
2017-06-30 12:30:22 +06:00
Rohit Waghchaure
3856d14ae6
[Fix] Options must be a valid DocType for field Customs Tariff Number
2017-06-30 11:57:41 +05:30
Manas Solanki
85480b3af7
Added report in config/schools.py
2017-06-30 11:36:57 +05:30
Manas Solanki
c4125b32ee
Course wise assessment reports
2017-06-30 11:36:57 +05:30
Sagar Vora
7640858510
[minor] fix bom price resetting on validation
2017-06-29 22:20:07 +05:30
mbauskar
53e34f5c1c
bumped to version 8.2.1
2017-06-29 22:28:08 +06:00
mbauskar
0c2de6e07a
[minor] fixed the report value for deprecated report patch
2017-06-29 21:47:14 +05:30
Rohit Waghchaure
b801357ecf
[minor] Total amount not showing value in bank reconcillation
2017-06-29 18:40:01 +05:30
mbauskar
8f1f93603d
bumped to version 8.2.0
2017-06-29 15:37:26 +06:00
Aditya Duggal
f1bd39c937
Allow NA values in GSTIN number ( #9503 )
...
-Reason for allowing NA value is that if a user wants to make GSTIN number mandatory then they can do the same easily
2017-06-29 14:25:19 +05:30
Manas Solanki
800c69eec3
validate the duplicate assessment criteria
2017-06-29 13:00:22 +05:30
mbauskar
ec252c806f
resolved merge conflicts
2017-06-29 12:11:07 +05:30
mbauskar
71b4e48ea5
bumped to version 8.1.7
2017-06-29 12:39:39 +06:00
Makarand Bauskar
ae2d92ee76
Merge pull request #9523 from saurabh6790/setup_wiz_fix
...
[fix] translate domain
2017-06-29 12:07:19 +05:30
Saurabh
21cf1fd851
[fix] translate domain
2017-06-29 12:04:45 +05:30
Makarand Bauskar
a938d3956a
[minor] get doc using party_name instead of party
2017-06-29 11:58:50 +05:30
Rushabh Mehta
02b0ed4199
[fix] update-gstin
2017-06-29 11:56:14 +05:30
Vishal Dhayagude
76f93d05b7
display image in supplier's list view ( #9500 )
...
* [fix]display supplier image in desk
* Supplier image displayed in desk
* Show image in supplier desk page
* [minor] removed whitespaces
2017-06-29 11:23:13 +05:30
Makarand Bauskar
24ab20fe11
Merge pull request #9467 from rohitwaghchaure/support_hours_report
...
[enhance] Report for analysis of support hours count
2017-06-29 11:19:41 +05:30
Makarand Bauskar
1eb31db71f
Merge pull request #9466 from manassolanki/validation
...
changes in student settings for validating the students in the student groups
2017-06-29 10:48:59 +05:30
Makarand Bauskar
ef95b4d6e3
Merge pull request #9468 from manassolanki/issue-11
...
in program enrollment filter out students which are already enrolled
2017-06-29 10:48:12 +05:30
Makarand Bauskar
514c0417dd
Merge pull request #9483 from manassolanki/fix-student-fetch
...
fetch queries for the students in the student group
2017-06-29 10:47:05 +05:30
Makarand Bauskar
67f6ac848c
Merge pull request #9497 from ashwinisave35/email_template_redesign
...
Adding ERPNext logo for email templates.
2017-06-29 10:46:44 +05:30
Makarand Bauskar
5d95ebec4e
Merge pull request #9508 from rohitwaghchaure/contacts_module_error
...
[Fix] Module error during patch execution
2017-06-29 10:46:17 +05:30
Makarand Bauskar
bb7317d398
Merge pull request #9512 from mbauskar/patch-fix
...
[fixes] delete auto email report of deprecated reports and other minor fixes
2017-06-29 10:45:50 +05:30
Makarand Bauskar
550268eaf3
Merge pull request #9518 from sagarvora/gh-9516
...
[minor] fix supplier GSTIN portal not getting displayed
2017-06-29 10:43:53 +05:30
Makarand Bauskar
7f9af46da5
[minor] removed whitespace
2017-06-29 09:38:46 +05:30
Makarand Bauskar
e38eb83358
[minor] removed print statement
2017-06-29 09:35:11 +05:30
Makarand Bauskar
af00c9f70b
[minor] removed whitespaces from get_students method
2017-06-29 09:25:19 +05:30
Makarand Bauskar
5c7545da0c
[minor] passed index for string format
2017-06-29 09:07:59 +05:30
mbauskar
d6e8bb5452
[fixes] delete auto email report of deprecated reports and other minor fixes
2017-06-29 08:39:01 +05:30
Sagar Vora
435032f5bc
[minor] fix typo
2017-06-28 23:59:47 +05:30
Sagar Vora
1ef50c89db
[minor] use party_name instead of party and save GSTIN in uppercase
2017-06-28 23:52:22 +05:30
tunde
690de64734
Merge branch 'develop' into issue-9166
2017-06-28 13:37:04 +01:00
tunde
c7e3a09cfb
adds if statement for reference_type === "Asset"
2017-06-28 13:23:18 +01:00
Rohit Waghchaure
2e4b4454b3
[Fix] Module error during patch execution
2017-06-28 17:31:59 +05:30
rohitwaghchaure
4b33b7e1c1
Merge pull request #9418 from nick9822/nick9822-patch-3
...
Removed "Asset" filter on payment account
2017-06-28 16:38:21 +05:30
rohitwaghchaure
69279229cc
Merge pull request #8987 from bcornwellmott/bom_convert_uom
...
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Rohit Waghchaure
5b7028c7bb
stock qty not changed if item change
2017-06-28 15:58:51 +05:30
mbauskar
e9a4f4e70d
bumped to version 8.1.6
2017-06-28 14:02:29 +06:00
Saurabh
be03de3ad6
Merge pull request #9502 from mbauskar/patch-fix
...
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:28:33 +05:30
mbauskar
6daa6e422e
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:26:50 +05:30
Saurabh
07913c3ff2
[fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note
2017-06-28 13:16:50 +05:30
mbauskar
3b0e6cecd6
[minor] fixed broken image url in gst documentation
2017-06-28 12:29:19 +05:30
Ashwini Save
544de60d36
Adding ERPNext logo for email tempates.
2017-06-28 11:44:09 +05:30
Manas Solanki
d652221071
fetch queries for the students in the student group
2017-06-28 11:26:41 +05:30
mbauskar
3bf9071598
bumped to version 8.1.5
2017-06-28 11:31:40 +06:00
mbauskar
27692670b1
[fix] handle email exception if email account is not configured
2017-06-28 10:56:50 +05:30
Saurabh
3f2dd04b10
[fix] reload gst settings doctype in patch
2017-06-28 10:50:38 +05:30
mbauskar
4e0999dda7
bumped to version 8.1.4
2017-06-28 11:10:07 +06:00
Makarand Bauskar
eef3f62ff7
Merge pull request #9488 from rmehta/gst-reminder
...
[regional] ability to send gst reminders to all parties
2017-06-27 19:33:05 +05:30
Makarand Bauskar
104eb8c6ad
[minor] render GSTIN value as "" instead of None
2017-06-27 18:59:35 +05:30
Manas Solanki
3959c7c3c1
filter out students which are already enrolled in program enrollment
2017-06-27 18:22:05 +05:30
Makarand Bauskar
b43f4073db
fixed TypeError: throw() got an unexpected keyword argument 'exception'
2017-06-27 18:15:52 +05:30
Rushabh Mehta
01659271be
[minor] dont make fixtures again by patch
2017-06-27 18:05:54 +05:30
Rushabh Mehta
c616a4a527
[tests] codacy
2017-06-27 17:50:15 +05:30
Rohit Waghchaure
eb7eb43dfc
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-27 17:34:44 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Makarand Bauskar
7b6e09b9a7
Merge pull request #9487 from rohitwaghchaure/currency_label_issue
...
[fix] Currency label not displaying in the total advance field
2017-06-27 16:16:22 +05:30
Makarand Bauskar
90a3e60de7
Merge pull request #9372 from pratu16x7/serial-batch-entry
...
Serial no/batch entry dialog
2017-06-27 16:12:30 +05:30
Rohit Waghchaure
f3e91e2b2b
[minor] Currency label not displaying in the total advance field
2017-06-27 15:51:35 +05:30
pratu16x7
846f5d4bd8
[fix] cloning rows
2017-06-27 14:03:56 +05:30
Makarand Bauskar
51520f9de6
Merge pull request #9479 from frappe-pr-bot/translations-2017-06-27
...
[translation] translation update
2017-06-27 13:58:04 +05:30
frappe-pr-bot
8ddd946dea
[translation] translation updates
2017-06-27 10:10:50 +02:00
Saurabh
c20abf6b2a
send email to system managers about gst setup
2017-06-27 13:21:57 +05:30
mbauskar
8c3f99f12e
revert customer-orders-invoices-and-shipping-status.md documentation
2017-06-27 12:49:10 +05:30
Rushabh Mehta
9b09ff29d2
[fix] address creation for india/setup.py
2017-06-27 12:17:39 +05:30
Rushabh Mehta
f4e908bd91
[minor] general_ledger.js
2017-06-27 11:56:30 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
pratu16x7
f970ca4d35
Update docs
2017-06-27 10:12:58 +05:30
pratu16x7
29cebbb0cd
use set_value() for setting rows
2017-06-27 09:48:28 +05:30
Rohit Waghchaure
0b078fb4cb
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-27 00:06:40 +05:30
pratu16x7
89d001caf3
[lint] fixes
2017-06-26 17:45:49 +05:30
tunde
6837e69187
Merge branch 'develop' into issue-9424
2017-06-26 13:05:27 +01:00
tunde
5824ae98d9
calls local to build frappe.form_dict in order to pass failing test
2017-06-26 12:42:11 +01:00
Rohit Waghchaure
67526f244e
[enhance] Report for analysis of support hours count
2017-06-26 17:04:52 +05:30
tunde
67cbeb1bb0
Merge branch 'develop' into issue-9096
2017-06-26 12:11:07 +01:00
tunde
8859eb23a3
set form_dict correctly
2017-06-26 12:01:41 +01:00
pratu16x7
ae450fc23b
async call to require, more validation
2017-06-26 15:31:46 +05:30
nick9822
82e816054e
Added report_type to payment account filter
2017-06-26 15:29:44 +05:30
tunde
ea7768d3f3
fixes form_dict failure in travis test
2017-06-26 10:17:53 +01:00
Manas Solanki
cb650f836e
validation of student in student attendance
2017-06-26 14:11:12 +05:30
Saurabh
095701e86b
bumped to version 8.1.3
2017-06-26 14:25:59 +06:00
pratu16x7
5f389c999a
[fix] values update in items in invoices
2017-06-26 13:38:24 +05:30
Saurabh
29fa0a9a17
[fix] patch fixes
2017-06-26 13:28:45 +05:30
tunde
c1d22adb9f
Merge branch 'develop' into issue-9424
2017-06-26 08:52:55 +01:00
tunde
bce13cd0e3
fixes failing test
2017-06-26 08:43:25 +01:00
Saurabh
3bf5a38c6f
bumped to version 8.1.2
2017-06-26 11:31:37 +06:00
Makarand Bauskar
c93de0e803
[minor] removed global roles from company doctype field's depends on propery ( #9450 )
2017-06-24 10:39:30 +05:30
Rushabh Mehta
d03203966a
[minor] fix old patch
2017-06-24 10:37:19 +05:30
Console Admin
8623166dca
Customer Query include Searchfields
...
frappe/erpnext#8821
2017-06-23 20:32:52 +03:00
pratu16x7
577e4c4e28
Add in transaction.js, cleanups
2017-06-23 19:25:01 +05:30
Makarand Bauskar
ebaea08225
Merge pull request #9437 from Arundhatii/20Jun
...
Added help pages and deleted old images links to #9241
2017-06-23 18:54:45 +05:30
Makarand Bauskar
1a78a3244b
removed conflicts
2017-06-23 18:37:08 +05:30
rohitwaghchaure
8f51a5e527
In POS on click of delete button, remove the selected item from the cart ( #9428 )
2017-06-23 18:17:04 +05:30
Makarand Bauskar
1d962dd3f7
removed conflicts
2017-06-23 18:11:58 +05:30
Makarand Bauskar
bbf81aa3a4
image title translation
2017-06-23 18:11:00 +05:30
Makarand Bauskar
862302f02d
image title translation
2017-06-23 18:10:06 +05:30
Makarand Bauskar
408336e7ad
image title translation
2017-06-23 18:08:45 +05:30
Makarand Bauskar
ab49c3100d
corrected image title
2017-06-23 18:04:56 +05:30
Makarand Bauskar
ec27a30069
Merge pull request #9442 from creamdory/develop
...
BOM Stock Report to allow Multi Level Warehouse Setup
2017-06-23 17:59:56 +05:30
Makarand Bauskar
5e994ddf65
removed white spaces
2017-06-23 17:58:50 +05:30
Makarand Bauskar
4eced4acec
Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco
...
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 17:24:50 +05:30
Frappe
a951e56f9c
Modified help pages
2017-06-23 16:49:35 +05:30
Frappe
1f8e5fbcb1
Edited help page
2017-06-23 16:48:46 +05:30
Frappe
ca6fed359b
Added help pages for Subcontracting and deleted old images
2017-06-23 16:48:17 +05:30
creamdory
9961fb82d6
Bom Stock Report Change Requests
2017-06-23 15:57:52 +08:00
Rohit Waghchaure
8326028d33
Don't validate delivery note and sales order required for the POS invoice
2017-06-23 12:56:12 +05:30
Rohit Waghchaure
666d004b40
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 12:10:21 +05:30
Frappe
9a8f33f855
Replaced screenshot in help pages, links to #9241
2017-06-23 11:30:26 +05:30
Frappe
8181a7463e
added help page for Kanban Board, links to #9241
2017-06-23 11:30:26 +05:30
Frappe
ac08fbd438
added test documentation
2017-06-23 11:30:26 +05:30
Rushabh Mehta
210b6f8f7e
[docs]
2017-06-22 22:32:08 +05:30
Rushabh Mehta
25366a22ad
[minor] cleanup
2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
tunde
94500fd17b
adds test case
2017-06-22 17:34:54 +01:00
tunde
dcd54209fc
parameterises sql string
2017-06-22 14:03:19 +01:00
pratu16x7
759f669214
Add in delivery note
2017-06-22 18:14:29 +05:30
pratu16x7
70eca9462b
make erpnext.SerialNoBatchSelector
2017-06-22 18:14:29 +05:30
pratu16x7
60d9446656
onchange in df
2017-06-22 18:14:29 +05:30
pratu16x7
934105bf34
fix modified by, blur serial field
2017-06-22 18:14:28 +05:30
pratu16x7
26b8f5c3ce
[minor]
2017-06-22 18:14:16 +05:30
pratu16x7
36693e27be
[fix] tests
2017-06-22 18:14:16 +05:30
pratu16x7
a5d5403bf3
specific change bubbling for grid fields
2017-06-22 18:13:56 +05:30
pratu16x7
0e35651e94
Add get_stock_qty test
2017-06-22 18:13:56 +05:30
pratu16x7
837ffbddbc
[minor]
2017-06-22 18:13:55 +05:30
pratu16x7
ff25573558
cleanup
2017-06-22 18:13:55 +05:30
pratu16x7
82a199d6d7
[fix] availably qty reupdate
2017-06-22 18:13:55 +05:30
pratu16x7
d15a507567
add serial_no_check
2017-06-22 18:13:55 +05:30
pratu16x7
01e79f033e
add warehouse selection and mapping
2017-06-22 18:13:55 +05:30
pratu16x7
9a6e675b41
wip
2017-06-22 18:13:55 +05:30
pratu16x7
7331f169fc
[fix] warehouse required bug
2017-06-22 18:13:54 +05:30
pratu16x7
d09f35fa98
fire modal on item_code, events, validation
2017-06-22 18:13:54 +05:30
pratu16x7
52d703a232
[fix] test
2017-06-22 18:13:54 +05:30
pratu16x7
e4e00d2215
batch item distribution by oldest, serial no check
2017-06-22 18:13:54 +05:30
pratu16x7
60944e3397
get oldest batch in modal, insert batch items
2017-06-22 18:13:30 +05:30
pratu16x7
0b642cd414
set available qty
2017-06-22 18:13:30 +05:30
pratu16x7
b4de1c771b
WIP
2017-06-22 18:13:30 +05:30
Rushabh Mehta
aedaac63ea
[wip] batch, serial number selector
2017-06-22 18:13:30 +05:30
mbauskar
04c8bf0b21
bumped to version 8.1.1
2017-06-22 17:30:25 +06:00
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
tunde
96e629a635
adds credits notes to report since double entry for P or L affects sales
2017-06-22 10:04:33 +01:00
mbauskar
ea77b63b4a
bumped to version 8.1.0
2017-06-22 13:40:58 +06:00
Makarand Bauskar
79d36c7c43
Merge pull request #9423 from mbauskar/patch-fix
...
[minor] save the system settings document
2017-06-22 12:49:35 +05:30
mbauskar
4b299ba009
[minor] save the system settings document
2017-06-22 12:46:31 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Rohit Waghchaure
2d9b3cd270
Fixed test cases
2017-06-22 12:23:15 +05:30
Ben Cornwell-Mott
ac3ad0810a
Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom
2017-06-21 10:17:39 -07:00
Ben Cornwell-Mott
1e96b7bbe5
Added conversion_factor update in patch
2017-06-21 10:16:50 -07:00
Makarand Bauskar
0ea5d941e6
Merge branch 'develop' into bom_convert_uom
2017-06-21 21:35:38 +05:30
nick9822
881491cd2b
Removed "Asset" filter on payment account
2017-06-21 19:51:08 +05:30
Makarand Bauskar
1b6746e3bc
Merge pull request #9388 from saurabh6790/dropbox_doc_fix
...
[update] dropbox documentation to show how to set redirect url to create access token
2017-06-21 19:10:45 +05:30
Makarand Bauskar
cdfccffc0d
Merge pull request #9341 from manassolanki/training-event
...
send email on update and on update after submit
2017-06-21 19:09:21 +05:30
Makarand Bauskar
7a2a2dad35
Merge pull request #9381 from almeidapaulopt/so_proj
...
link sales order to new project
2017-06-21 18:48:30 +05:30
Umair Sayyed
5057098a19
Updated help pages and removed old images, links to #9262
2017-06-21 17:54:39 +05:30
Makarand Bauskar
ce7087f08a
Merge pull request #9408 from mbauskar/develop
...
merged hotfix branch to develop
2017-06-21 16:41:33 +05:30
Makarand Bauskar
b37eb10421
Merge pull request #9382 from nick9822/nick9822-patch-1
...
Resetting batch and serial nos checks
2017-06-21 16:34:32 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
mbauskar
9b4690995e
bumped to version 8.0.51
2017-06-21 13:47:12 +06:00
Manas Solanki
29ba4143f9
make quotation against lead company name ( #9188 )
2017-06-21 12:55:27 +05:30
Makarand Bauskar
9b5d1fc458
Merge pull request #9401 from sagarvora/so-calendar
...
[fix] get status in calendar view and show green background
2017-06-21 12:41:27 +05:30
Manas Solanki
7f64f623f0
Trigger assessment plan every time page loads
2017-06-21 12:08:23 +05:30
Sagar Vora
6371b53b7e
[fix] get status in calendar view and show green background
2017-06-21 11:58:29 +05:30
Saurabh
8d269beb45
[minor][fix] pass template item name to make_variant_item_code
2017-06-20 20:14:14 +05:30
Makarand Bauskar
cd5dd890aa
Merge pull request #9384 from nick9822/nick9822-patch-2
...
Bug while fetching stock balance of new item.
2017-06-20 19:52:28 +05:30
Saurabh
88b642637b
update dropbox documentation to show how to set redirect url to create access token
2017-06-20 19:01:16 +05:30
Umair Sayyed
357cd6df90
added new images, links #9262
2017-06-20 18:19:50 +05:30
Umair Sayyed
3292e59dcd
Replaced old images with new, links to #9262
2017-06-20 18:17:40 +05:30
nick9822
cc699a94fd
Bug while fetching new item balance.
2017-06-20 17:13:29 +05:30
nick9822
43a48fd2bc
Resetting batch and serial nos checks
2017-06-20 17:02:55 +05:30
Paulo Almeida
2d5e65ddcf
link sales order to new project
2017-06-20 12:08:22 +01:00
frappe-pr-bot
db4bb720b8
[translation] translation updates
2017-06-20 11:22:36 +02:00
Makarand Bauskar
8fac4314aa
Merge pull request #9373 from sagarvora/gh-9289
...
Check for align_labels_left before adding text-right class
2017-06-20 14:31:22 +05:30
Sagar Vora
89d60ca35e
Check for align_labels_left before adding text-right class
2017-06-20 14:16:06 +05:30
Rushabh Mehta
17e6bb83eb
[fix] typo, item group route to have parent only for non root
2017-06-20 14:07:33 +05:30
Makarand Bauskar
958b06b129
Merge pull request #9369 from sagarvora/gh-4559
...
[minor] calculate balance in company currency instead of account currency
2017-06-20 13:26:10 +05:30
Ayush Shukla
a111f78566
Leaderboard of customers, items, suppliers and sales partner ( #9354 )
...
* First commit leaderboard working
* Styling and added href
* Changed timeline string
* Changes in item
* Cleanup
* Fix
* made changes to currency column
* Code cleanup for codacy
* Sorting bug fixed and formatting done
* Changed type to isinstance
2017-06-20 13:04:45 +05:30
Vishal Dhayagude
310d4dc9e0
UOM column in Batch Wise Balance History Report ( #9359 )
...
* Training Events/Results link to employee dashbord
* [minor]Improve validation message for Buying / Selling Setting
* [minor]Added UOM cloumn in Batch Wise Balance History Report
* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Britlog
faf75c4ddd
Fix and improve shopping cart ( #9348 )
...
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Rushabh Mehta
c422874418
Update company.py
2017-06-20 12:19:36 +05:30
Rushabh Mehta
777526e3a8
Update __init__.py
2017-06-20 12:14:32 +05:30
Makarand Bauskar
22773a29f7
Merge pull request #9356 from tundebabzy/issue_6510
...
adds information about "Is Paid" and "Update Stock"
2017-06-20 12:04:16 +05:30
Sagar Vora
5b08d7acb3
[minor] calculate balance in company currency instead of account currency
2017-06-20 11:50:23 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
65ccb42f95
fixed document
2017-06-20 10:21:34 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Rushabh Mehta
80ef298519
[fix] [tests] test_delivery_note
2017-06-20 10:07:28 +05:30
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
tunde
4961072b51
adds the corrected breadcrumbs trail
2017-06-19 13:51:27 +01:00
Makarand Bauskar
9a5c39d329
Merge pull request #9353 from mbauskar/develop
...
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 18:16:22 +05:30
tunde
46db749d62
adds information about "Is Paid" and "Update Stock"
2017-06-19 09:18:57 +01:00
mbauskar
de5a11e8fb
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 13:07:51 +05:30
Sagar Vora
086b6a33ea
Fixed BOM value not updating on changing item ( #9350 )
2017-06-19 12:25:14 +05:30
Sagar Vora
67fe1010c7
[minor] set_posting_time=1 only when imported data contains posting date. ( #9349 )
2017-06-19 12:12:22 +05:30
Rushabh Mehta
b7b49f6da7
[fixes] fix message and type conversion;
2017-06-19 09:59:09 +05:30
Charles-Henri Decultot
2305eda82e
Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification ( #9339 )
2017-06-19 09:25:54 +05:30
Umair Sayed
ac2e32a511
replaced some old images with new, #9262 ( #9335 )
2017-06-19 09:23:04 +05:30
Ben Cornwell-Mott
2c77165fc6
Fixed small code issues (codecy)
2017-06-16 13:47:40 -07:00
Manas Solanki
9936100a6a
send email on update and on update after submit fixes #8898
2017-06-16 22:18:20 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
mbauskar
3c1a53c325
[minor] use reload_doc instead of reload_doctype
2017-06-16 18:31:42 +05:30
Rushabh Mehta
73167eae60
[demo] make it faster, do not send user email
2017-06-16 16:55:32 +05:30
tundebabzy
9a3462031d
[UX] Error in purchase transaction - Ignore instead of Prompt #7766 ( #9329 )
...
* sets tax category to "Total" if all items are non-stock items
* makes notification message translatable and removes multi-line string
* Update buying_controller.py
2017-06-16 15:30:14 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
mbauskar
2ea55c7143
[minor] reload Domain doctype before executing patch
2017-06-16 14:33:59 +05:30
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Sagar Vora
b1c794a4f9
[hot] fix global name args is not defined ( #9326 )
2017-06-16 13:50:35 +05:30
rohitwaghchaure
fb45913b3b
[fix] Patch for move account head from account to warehouse ( #9325 )
2017-06-16 13:12:37 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
Vishal Dhayagude
2510d1c86a
Training Events/Results link added to Employee ( #9313 )
2017-06-16 11:58:08 +05:30
Umair Sayed
5dadb0e19a
created help page for email inbox, fixes #9262 ( #9315 )
2017-06-16 11:57:44 +05:30
Britlog
224eb90199
Fix get_parents context ( #9296 )
2017-06-16 11:51:06 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
Manas Solanki
b07535bb64
bug in training result module ( #9314 )
2017-06-16 11:20:42 +05:30
Rushabh Mehta
c8a0de5e59
Revert "sets tax category to "Total" if all items are non-stock items ( #9295 )" ( #9320 )
...
This reverts commit 476c4fec1d
2017-06-16 11:18:23 +05:30
tundebabzy
476c4fec1d
sets tax category to "Total" if all items are non-stock items ( #9295 )
2017-06-16 11:17:40 +05:30
Ben Cornwell-Mott
840c757b12
Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom
2017-06-15 08:53:29 -07:00
Ben Cornwell-Mott
7055446508
Reload explosion and scrap items docs
2017-06-15 08:52:55 -07:00
Rushabh Mehta
e0434ad40e
Merge branch 'develop' into bom_convert_uom
2017-06-15 17:32:27 +05:30
mbauskar
5da3ac63bf
[minor] fixed merge conflicts
2017-06-15 16:09:42 +05:30
mbauskar
489550ed59
bumped to version 8.0.50
2017-06-15 16:35:49 +06:00
Makarand Bauskar
a4af7cb7d3
removed extra quote from query
2017-06-15 16:02:44 +05:30
Nabin Hait
5aee7d1b70
Change column length of in_words
2017-06-15 15:35:08 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
mbauskar
39f4130a0a
bumped to version 8.0.49
2017-06-15 13:59:40 +06:00
Nabin Hait
6e9a146f2b
Merge pull request #9193 from tundebabzy/issue_9180
...
Payment Entry - Latest Exchange Rate not fetched
2017-06-15 12:34:27 +05:30
Makarand Bauskar
428e5b7172
Merge pull request #9299 from rohitwaghchaure/refernce_name_issue
...
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:32:00 +05:30
Nabin Hait
2153399c39
Create journal_entry.py
2017-06-15 12:30:58 +05:30
Rohit Waghchaure
5ea8c97b7c
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:16:15 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
rohitwaghchaure
03ba66d0d8
[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice ( #9290 )
2017-06-14 19:41:11 +05:30
Umair Sayed
0b8e19b5d8
Added new help pages as per OKR - DO NOT MERGE ( #9291 )
...
* added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262
* some fixes in help docs
2017-06-14 19:40:08 +05:30
tunde
3514332cd8
changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate
2017-06-14 13:14:40 +01:00
Manas Solanki
67c4f1713b
Minor changes in the UX and courses automatically fetched upon saving ( #9264 )
2017-06-14 17:34:36 +05:30
Manas Solanki
95ca531def
make quotation against lead company name ( #9188 )
2017-06-14 16:13:23 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Sagar Vora
847444724b
remove bracket ( #9284 )
2017-06-14 15:51:47 +05:30
Sagar Vora
d19c2e2e93
[minor] Check if item is stock item before validating Warehouse while Purchase Return ( #9282 )
...
* Check if item is stock item before validating Warehouse
* changed logic to decide warehouse_mandatory
2017-06-14 15:39:41 +05:30
KanchanChauhan
c849f647f7
Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists ( #9168 )
2017-06-14 15:37:47 +05:30
Manas Solanki
40be3f4048
fix in the item for the function make_variant_item_code ( #9280 )
2017-06-14 15:06:07 +05:30
Manas Solanki
737482423b
change in the absent student report ( #9185 )
2017-06-14 15:05:48 +05:30
tundebabzy
5c9dd42547
fixes #9098 : don't skip calculation if income or expense is [] ( #9267 )
2017-06-14 14:57:34 +05:30
rohitwaghchaure
4c0f9dac94
Total amount not showing for credit note column in the print ( #9278 )
2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6
[minor] fixed Cannot read property 'default_letter_head' of undefined ( #9268 )
2017-06-14 12:52:13 +05:30
Sagar Vora
99a2db80ab
move bom based rate calculation to end ( #9271 )
2017-06-14 12:38:27 +05:30
rohitwaghchaure
1b2b4a626f
[Fix] Accounts receivable report showing wrong currency for total amount against the customer ( #9276 )
2017-06-14 12:32:52 +05:30
bcornwellmott
d53dd7f4c9
Merge branch 'develop' into bom_convert_uom
2017-06-13 08:40:24 -07:00
Sagar Vora
489ab6d70d
[minor] remove hardcoded flt precision and use system default ( #9250 )
...
* possible fix
* use system default precision for flt
2017-06-13 18:58:47 +05:30
tundebabzy
26a39610ca
fixes #8941 : Better error message for duplicate items ( #8968 )
...
* fixes #8941 : Better error message for duplicate items
* gathers all non unique items instead of first encountered non unique item
* renders errored items with `br` instead of `li`
2017-06-13 17:40:56 +05:30
Ashwini Save
eed0cee186
Solve issue for while changing status of sales order page not reloading ( #9204 )
...
* Solve issue for while changing status of sales order page not reloading
* Close Sales order issue : code review Changes.
2017-06-13 17:14:06 +05:30
Makarand Bauskar
da15486624
Merge pull request #9260 from mbauskar/address-and-contacts
...
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:08:56 +05:30
Makarand Bauskar
a7a7c835cc
Merge pull request #9196 from msiddiq0/patch-2
...
Fix incorrect youtube link on Video Tutorials
2017-06-13 17:05:50 +05:30
Makarand Bauskar
f339f6d69f
Merge pull request #9195 from msiddiq0/patch-1
...
Fixed wrong YouTube video link
2017-06-13 17:05:36 +05:30
Makarand Bauskar
65f5cf3fc1
Merge pull request #9197 from msiddiq0/patch-3
...
Fix incorrect YouTube link on Video Tutorials
2017-06-13 17:05:19 +05:30
mbauskar
96ce5821b8
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:03:13 +05:30
Makarand Bauskar
0c5d732cd8
Merge pull request #9208 from mbauskar/docs
...
removed {next} from documentation and removed the globals from custom scripts
2017-06-13 16:32:26 +05:30
Makarand Bauskar
70ef313b0d
Merge pull request #9245 from frappe-pr-bot/translations-2017-06-13
...
[translation] translation update
2017-06-13 16:23:22 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
Saurabh
0b35a3a67a
bumped to version 8.0.48
2017-06-13 15:50:13 +06:00
frappe-pr-bot
f7fe66cc48
[translation] translation updates
2017-06-13 11:17:57 +02:00
Makarand Bauskar
8ce53c94d1
Merge pull request #9189 from mbauskar/mysql-lockout
...
[hotfix] fixes for mysql Lock wait timeout exceeded
2017-06-13 14:41:42 +05:30
mbauskar
6f71648719
[minor] removed the else condition in update_qty
2017-06-13 14:36:30 +05:30
mbauskar
f819c93329
[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin
2017-06-13 13:22:34 +05:30
_JG_
aafe0c517f
Update purchase_order_dashboard.py ( #9149 )
...
There are no links to projects
2017-06-13 13:00:47 +05:30
Makarand Bauskar
757e1bf846
Merge pull request #9213 from manassolanki/school-report
...
fix for student monthly attendance report
2017-06-13 12:30:37 +05:30
Ashwini Save
7f14f28099
Account Receivable - Credit Note column added to print format. ( #9230 )
...
* Account Receivable - Credit Note column added to print Format.
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
2017-06-13 11:18:39 +05:30
Makarand Bauskar
88a0d22c10
Merge pull request #9214 from saurabh6790/stock_ledger_entry_indexing
...
[fix] add index on voucher type and voucher no in stock ledger entry
2017-06-12 17:26:24 +05:30
Nabin Hait
d0ac0bdc18
Merge branch 'master' into develop
2017-06-12 13:50:12 +05:30
Nabin Hait
d3e1afa2f5
bumped to version 8.0.47
2017-06-12 14:20:11 +06:00
Rohit Waghchaure
782d477be0
[fix] Due Date cannot be before Posting Date
2017-06-12 12:35:40 +05:30
Rushabh Mehta
4f8f9c1d9a
[enhance] create demo with function bench --site sitename make-demo` ( #9212 )
2017-06-12 09:18:06 +05:30
Rohit Waghchaure
c8490626f9
[minor] added mobile no to search customer in POS
2017-06-10 12:21:37 +05:30
tunde
5127da952e
changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate
2017-06-09 17:11:41 +01:00
bcornwellmott
fed9816213
Removed trailing whitespace
2017-06-09 07:37:27 -07:00
bcornwellmott
a35839aa47
Removing unused pprint
2017-06-09 07:36:15 -07:00
Saurabh
0c21d85f0d
[fix] add index on voucher type and voucher no in stock ledger entry
2017-06-09 19:05:30 +05:30
tunde
7bf4b121f3
Merge branch 'hotfix' into issue_9180
2017-06-09 13:58:22 +01:00
Manas Solanki
4458eb356b
fix for student monthly attendance report
2017-06-09 18:20:21 +05:30
mbauskar
828804fab0
[minor] removed the {next} from the last articles
2017-06-09 17:30:36 +05:30
mbauskar
11f0ee3cac
[docs] removed the globals from documentation
2017-06-09 17:23:06 +05:30
Faris Ansari
0626716f48
Merge pull request #9182 from pratu16x7/stock-entry-detail-global-fix
...
[fix] sys_defaults global in stock entry detail
2017-06-09 16:27:07 +05:30
rohitwaghchaure
97fd21a01d
[Fix] Accounts receivable summary report not loading data because credit note column was missing ( #9191 )
...
* [Fix] Accounts receivable summary report not loading data because credit note column was missing
* Create accounts_receivable_summary.py
2017-06-09 14:05:10 +05:30
Makarand Bauskar
665311b38a
[hotfix] replaced __ call with _ in project_timesheets.html ( #9198 )
2017-06-09 14:03:20 +05:30
tunde
0a5db528b1
makes sure latest test fixtures for currency exchange is retrieved before running test
2017-06-09 08:14:10 +01:00
msiddiq0
a05c168808
Fix incorrect YouTube link on Video Tutorials
...
The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.
2017-06-08 21:02:45 -04:00
msiddiq0
a095d6e04b
Fixing youtube link
...
Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"
2017-06-08 20:51:50 -04:00
msiddiq0
03183332b4
Fixed wrong YouTube video link
...
The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.
2017-06-08 20:10:18 -04:00
tunde
9b827e5b95
makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries
2017-06-08 20:54:01 +01:00
tunde
6148fe0909
adds test case to confirm that latest exchange rate is automatically selected
2017-06-08 20:50:11 +01:00
tunde
88f1d316d8
adds new tests that verify that get_exchange_rate returns the latest exchange rate
2017-06-08 19:44:26 +01:00
tunde
3eb5cb14d1
calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate
2017-06-08 14:23:49 +01:00
mbauskar
1042941348
[hotfix] fixes for mysql Lock wait timeout exceeded
2017-06-08 18:45:50 +05:30
pratu16x7
adb418d453
[fix] sys_defaults global in stock entry detail
2017-06-08 10:42:03 +05:30
Nabin Hait
2c808c578d
Merge branch 'master' into develop
2017-06-08 10:34:45 +05:30
Nabin Hait
72f7a1a748
bumped to version 8.0.46
2017-06-08 11:04:44 +06:00
bcornwellmott
5491275b66
Merge branch 'develop' into bom_convert_uom
2017-06-07 08:42:54 -07:00
Javier Wong
b414f73931
[enhancement] Allow on Submit for Sales Order Customer PO and Customer PO Date ( #9137 )
2017-06-07 20:11:45 +05:30
ahmadRagheb
9017f3768b
Fix labels to accept translation in selling doctype ( #9135 )
...
"label": _("Customer Addresses And Contacts"),
"label": _("Sales Partner Addresses And Contacts"),
now they can accept to be translated
2017-06-07 20:08:39 +05:30
Nabil Kadimi
41f6f4c200
Fix type (entrys) ( #9131 )
2017-06-07 20:08:11 +05:30
rohitwaghchaure
1607125815
[minor] POS customer creation was disabled in offline mode ( #9169 )
2017-06-07 20:06:58 +05:30
Umair Sayed
0dd5a20ca6
Help links added help_links.js ( #9170 )
...
* help links in help_links.js
* fixed in help_links.js
2017-06-07 20:05:35 +05:30
rohitwaghchaure
6b95210c19
[Fix] User not able to view projects from the portal ( #9173 )
2017-06-07 20:03:37 +05:30
Makarand Bauskar
59a1540898
[minor] removed the deprecated inList method from eval ( #9177 )
2017-06-07 20:02:09 +05:30
tundebabzy
98f8da1294
hides payments field when is_pos is checked ( #9174 )
2017-06-07 20:01:51 +05:30
tundebabzy
f3be8e0da6
removes check for condition - status == "Submitted" ( #9176 )
2017-06-07 19:59:33 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
Nabin Hait
d0e530c63d
bumped to version 8.0.45
2017-06-07 12:42:11 +06:00
Nabil Kadimi
347a79db5a
Fix typo ( #9133 )
2017-06-07 12:06:05 +05:30
Frappe PR Bot
7c9010018d
[translation] translation updates ( #9156 )
2017-06-07 12:05:29 +05:30
tundebabzy
f981eee221
fixes issue #9013 : Salary calculation Error. ( #9044 )
...
* fixes issue #9013 :
Salary calculation Error.
* adds test case for scenario as in #9013
2017-06-07 12:05:00 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
tundebabzy
99b734bfd7
Fix #4587 : Status does not display "Pending" in report filter ( #9104 )
...
* adds Material Request to `status_map`
* updates eval condition for Partially Ordered in Material Request map
* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options
* adds more options to `validate_status`
* adds `set_status` just before saving
* adds `check_for_closed_status` in `before_cancel`
* adds patch to convert status to material request specific status
* adds stricter status update conditions
* changes `update_status` to me `set_status`
* adds checker such that draft status can only change to pending
* renames `check_draft_status` to `status_can_change`
* adds Cancelled to Material Request map
* makes `status_can_change` block any attempt to change a cancelled document
* adds more test cases
* updates what `set_status` checks for before adding comment
* adds patch to rename the present material request status
2017-06-07 12:02:07 +05:30
Manas Solanki
ba7ed4626c
fetch query for assessment group ( #9120 )
2017-06-07 11:57:11 +05:30
Nabin Hait
17378e8a29
Added a new column for Credit/Debit Note in AR/AP report ( #9123 )
2017-06-07 11:56:53 +05:30
Manas Solanki
b76b4f40a0
Added mode of transport in program enrollment ( #9124 )
2017-06-07 11:56:26 +05:30
Prateeksha Singh
3a18dea8a4
[fix][multiselect] don't show completed PRECs for a PINV ( #9125 )
2017-06-07 11:55:25 +05:30
Makarand Bauskar
db8363e9eb
[minor] check serial no filedtype before updating ( #9126 )
...
* Update serial_no.py
Takes care of Different FieldTypes
* [minor] check serial no filedtype before updating
2017-06-07 11:54:26 +05:30
Manas Solanki
214e6906e5
Addition of field 'group based on' in the student attendance tool ( #9152 )
2017-06-07 11:53:41 +05:30
Manas Solanki
39adfb52f3
Naming in the assessment plan ( #9153 )
2017-06-07 11:52:36 +05:30
rohitwaghchaure
ce6e621c18
[fix] Not able to cancel the invoice if it's linked with the timesheet ( #9157 )
2017-06-07 11:52:04 +05:30
Manas Solanki
2a0d650735
fix in the report ( #9167 )
2017-06-07 11:29:27 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott
70fe968f02
Fixed some errors
2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott
a3aa6a4449
Changed Explosion Item as well
2017-06-02 16:54:03 -07:00
Makarand Bauskar
c196d740e5
[minor] added filter for batch no field in purchase transaction ( #9038 )
...
* [minor] added filter for batch no field in purchase transaction
* [minor] filter the batch based on item_code instead of get_batch_no method
* [minor] filter based on item_code for Purchase Invoice with update stock
2017-06-02 17:28:40 +05:30
Nabin Hait
5b8b4dcce1
Merge branch 'master' into develop
2017-06-02 14:05:54 +05:30
Nabin Hait
52e443cfc8
bumped to version 8.0.44
2017-06-02 14:35:53 +06:00
Nabin Hait
ae07f22d8b
Fixed syntax error
2017-06-02 13:57:16 +05:30
Nabin Hait
02d282f347
Merge branch 'master' into develop
2017-06-01 19:09:37 +05:30
Nabin Hait
1091a25491
bumped to version 8.0.43
2017-06-01 19:39:36 +06:00
Britlog
495a408db0
Fix contact form if email is both customer and lead ( #9075 )
2017-06-01 19:08:04 +05:30
Charles-Henri Decultot
5ade661a9a
Weekly digest subject translation ( #9003 )
2017-06-01 19:06:32 +05:30
ahmadRagheb
c4d2bab5b3
Arabic language shows Errors onSubmit in maintenance_schedule ( #9082 )
...
* Arabic language shows Errors onSubmit in maintenance_schedule
when trying to submit using arabic language error show up ,
i replace this way of formating arguments
description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
(self.name, d.item_code, self.customer)
to new one :description = frappe._("Reference: %s, Item Code: %s and Customer: %s").format(self.name, d.item_code, self.customer)
and it solve the problem on my local
* Arabic language shows Errors onSubmit in maintenance_schedule
* Arabic language shows Errors onSubmit in maintenance_schedule
2017-06-01 19:06:00 +05:30
Frappe PR Bot
59ee45a1a5
[translation] translation updates ( #9081 )
2017-06-01 19:05:28 +05:30
Ashwini Save
2020dd37e8
Fixed issue : Payment Entry allocating amount more than invoice amount. ( #9084 )
...
* Fixed issue : Payment Entry allocating amount more than invoice amount.
* Added condition to solve issue when allocated amount is null
* Code review Changes for payment entry
2017-06-01 19:00:34 +05:30
Faris Ansari
9f6d024260
Set website route field as No Copy field ( #9106 )
...
* Set website route field as No Copy field
* minor
2017-06-01 18:58:07 +05:30
rohitwaghchaure
7f2513f7a1
[Fix] Employees working on a holiday report's date filter not working ( #9108 )
2017-06-01 18:57:34 +05:30
Manas Solanki
f60bd60012
Fix the demo for the schools ( #8879 )
...
* Fix the demo for the schools
* Fix for the demo
https://github.com/frappe/erpnext/issues/6347
2017-06-01 18:30:35 +05:30
Nabin Hait
e4b3a67e74
Rate validation in return entry
2017-06-01 16:47:45 +05:30
Manas Solanki
f02c82aeca
Fixes in the patch ( #9027 )
...
* fix in the patch
* new patch for student groups
* changes in the merge student batch patch
2017-06-01 13:08:27 +05:30
tundebabzy
cf92be88b7
[minor] fixes typo ( #9093 )
2017-05-31 13:21:12 +05:30
Nabin Hait
fa16b849a0
Merge branch 'master' into develop
2017-05-30 22:52:39 +05:30
Nabin Hait
f2c374f524
bumped to version 8.0.42
2017-05-30 23:22:38 +06:00
mbauskar
26044f436a
[minor] fixed a unexpected token error for opportunity
2017-05-30 22:28:08 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
93b5367485
bumped to version 8.0.41
2017-05-30 16:29:04 +06:00
Manas Solanki
5995010007
Correction in the validation message ( #9079 )
2017-05-30 15:56:48 +05:30
bcornwellmott
0d38a6b495
Fix grammar error in HR Training Results ( #9076 )
...
* Fix Typo in message
Issue #9074
* Added condition for notifying user of grade.
2017-05-30 15:56:02 +05:30
Manas Solanki
a85b68ee77
link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 ( #9071 )
2017-05-30 15:55:00 +05:30
Manas Solanki
ca31425bb4
field for the naming series should have no copy attribute ( #9067 )
2017-05-30 15:36:50 +05:30
Manas Solanki
253c53cf53
updating serial no status from scheduler #9061 ( #9066 )
2017-05-30 15:35:58 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Nabin Hait
5d7e8d9e83
Minor fix in timesheet ( #9063 )
2017-05-30 15:34:35 +05:30
Nabin Hait
6a5cf672c1
Fixed opportunity status ( #9062 )
2017-05-30 15:34:20 +05:30
Manas Solanki
5f7b88d9c3
set student roll no in backend if not given ( #9039 )
2017-05-30 15:33:50 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Faris Ansari
dae7721384
Merge pull request #8975 from almeidapaulopt/milestones
...
Milestones in Project Gantt
2017-05-29 10:58:35 +05:30
Nabin Hait
6a541a6f7a
Merge branch 'master' into develop
2017-05-26 21:35:42 +05:30
Nabin Hait
38ada81487
bumped to version 8.0.40
2017-05-26 22:05:41 +06:00
Prateeksha Singh
e38c70c8bc
[fix] uppercase filter frappe/erpnext#8996 ( #9026 )
2017-05-26 21:34:18 +05:30
Francisco Roldán
44c1a610a1
Financial Statements Button translateabled ( #9032 )
2017-05-26 21:32:51 +05:30
Makarand Bauskar
157c334737
[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents ( #9037 )
2017-05-26 21:32:33 +05:30
Nabin Hait
4b12896941
Party Dashboard: Consider any random company if default company not set ( #9046 )
2017-05-26 21:25:36 +05:30
Sagar Vora
7b0c682635
[fix] add round off difference to last row in landed cost voucher ( #8989 )
...
* [fix] add round off difference to last row in landed cost voucher
* Add test case for odd numbers
* Add assertEquals to verify applicable charges
* Use make_purchase_receipt, move round off logic
* Allow rounding difference
* Specify cost center to pass test
2017-05-26 14:58:54 +05:30
Ashwini Save
d702cbfbfa
Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. ( #9025 )
2017-05-25 15:48:08 +05:30
Nabin Hait
45d337a016
Merge branch 'master' into develop
2017-05-25 14:19:51 +05:30
Nabin Hait
d7d9cd2938
bumped to version 8.0.39
2017-05-25 14:49:50 +06:00
Nabin Hait
7e7dc0f254
Update party.py
2017-05-25 14:18:20 +05:30
Ayush Shukla
e9cf1aba77
added float and rebase with hotfix ( #9019 )
2017-05-25 14:14:55 +05:30
Manas Solanki
c2bf50042f
validate email id only if provided ( #9020 )
2017-05-25 14:14:42 +05:30
bcornwellmott
8fa1e03367
Merge branch 'develop' into bom_convert_uom
2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
Nabin Hait
12ec71781d
bumped to version 8.0.38
2017-05-24 19:08:33 +06:00
Makarand Bauskar
2f17e70793
[minor] removed the {next} for last page ( #9002 )
2017-05-24 18:35:35 +05:30
Manas Solanki
659a225f24
allow multiple items in purchase receipt ( #8997 )
2017-05-24 17:49:52 +05:30
Ishan Loya
9bf4563b7a
Change modified time
2017-05-24 17:47:42 +05:30
Ishan Loya
a70b41fbb8
Remove Role 'All' from BOM
2017-05-24 17:47:42 +05:30
CH
d0ebd7f7c2
POS translatable fields correction
2017-05-24 17:45:46 +05:30
Nabin Hait
adfe84b04f
Revert "Website Specification Labls should not be capitalised by default ( #8798 )"
...
This reverts commit 331566d612
2017-05-24 17:33:07 +05:30
Nabin Hait
7916590528
Revert "Update lead.py ( #8789 )"
...
This reverts commit 9283377f87
2017-05-24 17:33:07 +05:30
Nabin Hait
fdce7a0dc3
Revert "link the different doctype in the school module ( #8844 )"
...
This reverts commit c320537e4c
2017-05-24 17:33:07 +05:30
Nabin Hait
b3d4326dcc
Revert "Prompt for mandatory batch number in POS ( #8928 )"
...
This reverts commit ce9ac7885e
2017-05-24 17:33:07 +05:30
Nabin Hait
54fcf85317
Revert "Documentation for Allow Login using Mobile Number ( #8918 )"
...
This reverts commit 818ad397c8
2017-05-24 17:33:07 +05:30
Nabin Hait
689da20e7b
Revert "View Attachments in portal ( #8830 )"
...
This reverts commit 7e661437b1
2017-05-24 17:33:07 +05:30
Nabin Hait
eb92d907bc
Revert "Added flt to convert string to float"
...
This reverts commit bf4915b285
2017-05-24 17:33:07 +05:30
Nabin Hait
0cd792ebb2
Revert "Update taxes_and_totals.py"
...
This reverts commit e4afab7fb0
2017-05-24 17:33:07 +05:30
Rushabh Mehta
e4afab7fb0
Update taxes_and_totals.py
2017-05-24 17:29:23 +05:30
Ayush AS
bf4915b285
Added flt to convert string to float
2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
7e661437b1
View Attachments in portal ( #8830 )
...
* View Attachments in portal
* HTML beautify correction
* Move option to shopping cart settings
* new field in shopping cart settings for public attachments display in portal
2017-05-24 17:29:23 +05:30
Gaurav Naik
818ad397c8
Documentation for Allow Login using Mobile Number ( #8918 )
2017-05-24 17:29:23 +05:30
Charles-Henri Decultot
ce9ac7885e
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-24 17:29:23 +05:30
Manas Solanki
c320537e4c
link the different doctype in the school module ( #8844 )
2017-05-24 17:29:23 +05:30
Abdulla P I
9283377f87
Update lead.py ( #8789 )
...
* Update lead.py
Import datetime to compare next contact date with now()
* Update lead.py
* Update lead.py
As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported
2017-05-24 17:29:23 +05:30
KanchanChauhan
331566d612
Website Specification Labls should not be capitalised by default ( #8798 )
2017-05-24 17:29:23 +05:30
nick9822
ca150cee8c
Minor change: Alert to msgprint ( #8966 )
...
* Minor change: Alert to msgprint
* msgprint to frappe.msgprint
2017-05-24 17:22:26 +05:30
mbauskar
ff70f38eac
[minor] patch to delete the schools deprecated doctypes
2017-05-24 17:13:16 +05:30
mbauskar
d1552f97e4
[minor] moved a comment in item.js
2017-05-24 17:13:16 +05:30
mbauskar
baa4afd67b
[minor] removed the Grade Interval and Grading Structure doctype
2017-05-24 17:13:16 +05:30
Nabin Hait
2f0c34385b
Check if doctype exists before renaming
2017-05-24 17:12:07 +05:30
Nabin Hait
258f7da778
Paid amount + Write Off Amount can not be greater than Grand Total in return POS
2017-05-24 17:12:07 +05:30
Nabin Hait
799a9cabe7
Can't change valuation method in stock settings, if there are transactions against some items which does not have it's own valuation method
2017-05-24 17:11:48 +05:30
Nabin Hait
24f0b13b22
Total unpaid amount in party is based on GLE
2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Charles-Henri Decultot
032374e76e
Correction of the digest template ( #8992 )
2017-05-24 16:29:42 +05:30
Nabin Hait
7a9bd41a72
Improved currency exchange rate message
2017-05-24 16:18:36 +05:30
Nabin Hait
8fac45a885
Merge branch 'master' into develop
2017-05-24 09:07:26 +05:30
Nabin Hait
88906cfc63
bumped to version 8.0.37
2017-05-24 09:37:26 +06:00
Nabin Hait
e72c98dafb
On change of item rate, set margin amount on price list rate, instead of margin percentage ( #8988 )
2017-05-24 09:01:44 +05:30
Makarand Bauskar
3b9c2a4438
Added a reference of Sales Invoice in Serial No ( #8855 )
...
* [enhance] added Sales Invoice reference in Serial Number
* [patch] added test cases for Sales Invoice and added patch to copy sales invoice
* [minor] minor fixes in validate_serial_against_delivery_note
* [minor] fixes in sales invoice serial number validation
2017-05-23 18:45:34 +05:30
Nabin Hait
dce8dfc4fe
Merge branch 'master' into develop
2017-05-23 17:48:43 +05:30
Nabin Hait
c8a25b6dac
bumped to version 8.0.36
2017-05-23 18:18:42 +06:00
Makarand Bauskar
724cc35421
[minor] added columns to pos print_template ( #8978 )
2017-05-23 17:43:42 +05:30
Nabin Hait
c9f5d84742
Merge branch 'master' into develop
2017-05-23 17:16:19 +05:30
Nabin Hait
8854f8bd50
bumped to version 8.0.35
2017-05-23 17:46:19 +06:00
Manas Solanki
fe05645051
fix issue when image not saved after attaching ( #8957 )
2017-05-23 17:13:26 +05:30
Faris Ansari
29d64cae34
POS print format fix ( #8973 )
2017-05-23 17:12:51 +05:30
Paulo Almeida
97ff6fea47
add milestone field
2017-05-23 11:55:37 +01:00
Nabin Hait
889e456dab
Merge branch 'master' into develop
2017-05-23 12:04:06 +05:30
Nabin Hait
2ef20a968c
bumped to version 8.0.34
2017-05-23 12:34:05 +06:00
