Nabin Hait
7a9bd41a72
Improved currency exchange rate message
2017-05-24 16:18:36 +05:30
Nabin Hait
cf1e0508af
Merge branch 'hotfix'
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
Nabin Hait
f8b412ba98
Merge branch 'hotfix'
2017-05-23 17:48:42 +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
67ae3a7f22
Merge branch 'hotfix'
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
Nabin Hait
84e50fe371
Merge branch 'hotfix'
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
Nabin Hait
fdc7d7f3de
Check for active quotations before declaring it as lost ( #8969 )
2017-05-23 12:02:34 +05:30
Manas Solanki
a68fff470c
minor fix in student group ( #8959 )
2017-05-23 11:39:53 +05:30
Manas Solanki
552f7ab678
fix in the patch for merging the student batch and student group ( #8961 )
2017-05-23 11:38:57 +05:30
Faris Ansari
2424aa73d7
Fix translated string in jinja ( #8956 )
2017-05-22 13:09:36 +05:30
Rushabh Mehta
50835cbaa0
Merge branch 'hotfix'
2017-05-19 19:24:42 +05:30
Rushabh Mehta
f3a318921f
bumped to version 8.0.33
2017-05-19 19:54:42 +06:00
rohitwaghchaure
529f5ce503
[fix] Not able to change the status as Lost in opportunity ( #8938 )
2017-05-19 18:56:54 +05:30
rohitwaghchaure
177a26849d
[fix] Trial balance not working ( #8937 )
2017-05-19 18:56:25 +05:30
Rushabh Mehta
d144a4c621
Merge branch 'hotfix'
2017-05-19 18:33:55 +05:30
Rushabh Mehta
d2484ece24
bumped to version 8.0.32
2017-05-19 19:03:54 +06:00
Rushabh Mehta
04ea4910f0
[rename] zh-tw -> zh-TW
2017-05-19 18:27:53 +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
