Charles-Henri Decultot
2de1cd3529
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-19 16:04:10 +05:30
Gaurav Naik
7f02714c26
Documentation for Allow Login using Mobile Number ( #8918 )
2017-05-19 16:03:05 +05:30
Charles-Henri Decultot
8bec0239b9
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-19 16:02:30 +05:30
Manas Solanki
56549fd3d9
link the different doctype in the school module ( #8844 )
2017-05-19 15:16:50 +05:30
Abdulla P I
6cbc9b03f9
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-19 15:15:36 +05:30
KanchanChauhan
32cbbe5cc2
Website Specification Labls should not be capitalised by default ( #8798 )
2017-05-19 15:14:31 +05:30
Rushabh Mehta
65a27395fe
[minor] remove student batch name from activation.py
2017-05-19 14:53:32 +05:30
Nabin Hait
91dcd8d952
Merge branch 'hotfix'
2017-05-19 14:12:28 +05:30
Nabin Hait
4d2d996782
bumped to version 8.0.31
2017-05-19 14:42:28 +06:00
Nabin Hait
47afc55939
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-19 14:10:53 +05:30
Nabin Hait
8c72fa2e4f
Merge branch 'develop'
2017-05-19 14:09:00 +05:30
Nabin Hait
0096240a65
bumped to version 8.0.30
2017-05-19 14:38:59 +06:00
Makarand Bauskar
864f134610
[minor] removed the da-DK.csv translations ( #8930 )
2017-05-19 14:04:52 +05:30
rohitwaghchaure
81fcbbefe5
Merge pull request #8929 from rohitwaghchaure/pos_transalate_issue
...
[fix] _ is not defined while accessing the POS
2017-05-19 13:23:27 +05:30
Rohit Waghchaure
8a1c58c3c3
[fix] _ is not defined while accessing the POS
2017-05-19 13:01:32 +05:30
Ayush Shukla
ae696d005a
Changed report_hide=0 for reference_name ( #8902 )
2017-05-19 12:38:08 +05:30
Prateeksha Singh
89cec18467
set variant name based on template name (frappe/erpnext#6367) ( #8920 )
2017-05-19 12:35:36 +05:30
Rushabh Mehta
4bcc2316a9
Don't update variant when template is updated ( #8922 )
...
* [fix] allow editing of variant properties, reverting earlier fix
* [minor] dont automatically update variants when the template is saved
2017-05-19 12:33:00 +05:30
Nabin Hait
012c9a0916
Set default account in mode-of-payment Cash, only if default cash account exists ( #8909 )
2017-05-19 12:30:58 +05:30
Frappe PR Bot
c080479f1f
[translation] translation updates ( #8927 )
2017-05-19 12:30:04 +05:30
tundebabzy
a109141624
Issue 8842 ( #8869 )
...
* adds test that confirms #8842
* fixes #8842 and adds tests
* fixes new test case
* adds test for `encode_company_abbr`
* adds six as a requirement
* fixes six.moves.range import
* fixes duplicate company used in test
* fresh commit of test
* fixes failing test - company not saving
* fixes failing test
* Revert "adds six as a requirement"
This reverts commit 80454d98dc5859c37dbf589a4152663d2d644906.
* replaces whitespace indentation with tabs
2017-05-19 11:42:45 +05:30
Prateeksha Singh
064530d11f
[minor] remove order_type as setter in multiselect ( #8906 )
2017-05-19 11:09:12 +05:30
Rushabh Mehta
6799e27390
[fix] chart of accounts root sorting, #8784 , #8897 ( #8904 )
2017-05-18 16:21:21 +05:30
Rushabh Mehta
c6d75eb942
[fix] allow editing of variant properties, reverting earlier fix ( #8905 )
2017-05-18 16:21:01 +05:30
Nabin Hait
83f8344e62
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:37 +05:30
Nabin Hait
ee59ecd396
Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:06 +05:30
gmplab
7607cc9dfa
try to fix #997 ,when cart is disabled, it will not show error and it will dedirect to 'contact' page ( #8636 )
2017-05-18 12:41:19 +05:30
Frappe PR Bot
32e453b8eb
[translation] translation updates ( #8867 )
2017-05-18 12:35:26 +05:30
Nabin Hait
b32cf35fe5
Merge branch 'develop'
2017-05-18 12:01:54 +05:30
Nabin Hait
9422f69fdf
bumped to version 8.0.29
2017-05-18 12:31:53 +06:00
Nabin Hait
61ac683847
Fixed chart of accounts for Indonesia ( #8900 )
2017-05-18 11:58:38 +05:30
Nabin Hait
8fac2ad183
Don't set batch nos automatically on saving, if already set and validate qty with batch ( #8887 )
2017-05-18 11:54:24 +05:30
Omar Jaber
52e1ba7714
update throw message in maintenance_schedule.py ( #8896 )
...
updating Throw message
2017-05-18 11:53:26 +05:30
Nabin Hait
08ea710c8f
Minor fix in creating chart of accounts based on existing ( #8890 )
2017-05-17 19:43:12 +05:30
Nabin Hait
4b544347a9
Hide 'Edit Posting Time' from printing ( #8888 )
2017-05-17 19:42:38 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +05:30
Nabin Hait
e4f80a6eaa
Open lost opportunity again if quotation made against it ( #8854 )
2017-05-17 19:41:39 +05:30
Rushabh Mehta
f69ffeb0b4
[fix] if rate is greater than price_list_rate, set margin instead of discount. Fixes frappe/erpnext#6468 ( #8856 )
2017-05-17 19:40:40 +05:30
Faris Ansari
f7a9023fda
Show empty state when no students are found in student attendance tool ( #8862 )
...
- fixes #8839
2017-05-17 19:37:31 +05:30
Julian Robbins
3d6567411d
Spelling improvmement ( #8866 )
2017-05-17 19:36:15 +05:30
Felipe Orellana
0952df29dc
Update product.py ( #8877 )
...
Hi!
If template_item_code is None on line 71-72 the query will return ALL "Item Price" records irrespective of item_code, potentially causing the wrong price list rate to be used.
Noticed this behavior when fetching product price for a group of items without "variant_of" data.
2017-05-17 19:20:01 +05:30
Ayush Shukla
76d965f340
[minor]-Changed receivable to payable ( #8880 )
2017-05-17 19:18:47 +05:30
Ayush Shukla
c55b805b66
[minor] process_payroll_create salary fixed, fixes frappe/erpnext#8853 ( #8881 )
...
* [minor] process_payroll_create salary fixed
* [minor] indentation fix
2017-05-17 19:18:26 +05:30
tundebabzy
cf7df5d106
fixes #8883 ( #8885 )
2017-05-17 19:17:04 +05:30
Sagar Vora
3b04b030eb
Fix cost center not getting pulled in DN and SINV ( #8878 )
...
* Fixes for getting selling cost center instead of company's default cost center.
* fix error in update_item
2017-05-17 19:16:27 +05:30
Nabin Hait
67ddcf9d32
Merge branch 'develop'
2017-05-17 13:54:04 +05:30
Nabin Hait
def2e4678c
bumped to version 8.0.28
2017-05-17 14:24:04 +06:00
Nabin Hait
1e2d7b3519
Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice ( #8882 )
2017-05-17 13:52:21 +05:30
Nabin Hait
3bd15fb19e
Merge branch 'develop'
2017-05-16 13:39:42 +05:30
Nabin Hait
a282c13d84
bumped to version 8.0.27
2017-05-16 14:09:41 +06:00
