Commit Graph

13685 Commits

Author SHA1 Message Date
Nabin Hait
83f9f93015 bumped to version 6.12.10 2015-12-11 15:05:41 +06:00
Nabin Hait
53804c5bed Merge pull request #4472 from umairsy/develop
[docs] Added new videos
2015-12-11 14:31:35 +05:30
Nabin Hait
d3d4fe45c6 Merge pull request #4473 from nabinhait/sms_logs
[fix] Ignore permissions while creating sms logs
2015-12-11 14:31:26 +05:30
Nabin Hait
fae4f0269b Merge pull request #4478 from nabinhait/website_image
[fix] Website Image validation
2015-12-11 14:31:18 +05:30
Nabin Hait
fc4eca5cc7 [fix] Website Image validation 2015-12-11 11:47:05 +05:30
Rushabh Mehta
a1a712b0c6 [minor] [fix] task close button condition 2015-12-11 11:16:03 +05:30
Nabin Hait
2164595933 [fix] Ignore permissions while creating sms logs 2015-12-10 18:09:57 +05:30
Umair Sayyed
8eaf5eee74 [docs] Added videos 2015-12-10 17:58:12 +05:30
Nabin Hait
09e5306825 Merge branch 'develop' 2015-12-10 14:41:02 +05:30
Nabin Hait
9cca3494c0 bumped to version 6.12.9 2015-12-10 15:11:02 +06:00
Nabin Hait
360b057b0a [chnage-log] 2015-12-10 14:37:28 +05:30
Nabin Hait
56ae9481a0 Merge pull request #4466 from rmehta/task-notification-on-overdue
[enhancement] task status will be set to overdue when it crosses expected end date
2015-12-10 14:30:34 +05:30
Nabin Hait
12425e22a6 Merge pull request #4462 from nabinhait/sal_slip_fix
[fix] Payment days calculation in salary slip
2015-12-10 14:23:31 +05:30
Nabin Hait
da80a649fc Merge pull request #4465 from anandpdoshi/fix/validate-website-image-public
[fix] validate that Item's website image is public
2015-12-10 14:23:14 +05:30
Rushabh Mehta
13ec41abb2 [enhancement] task status will be set to overdue when it crosses expected end date 2015-12-10 12:59:02 +05:30
Anand Doshi
b3051ab84d [fix] validate that Item's website image is public 2015-12-10 11:46:20 +05:30
Nabin Hait
533aba02c5 [fix] Payment days calculation in salary slip 2015-12-10 10:50:42 +05:30
Rushabh Mehta
a5cf8a86c1 [minor] lang fixes for email digest 2015-12-10 10:38:46 +05:30
Rushabh Mehta
c819fd4ee8 [translations] for #4461 2015-12-10 10:34:32 +05:30
Anand Doshi
2af44ffd06 [fix] setup wizard is_private 2015-12-09 17:29:11 +05:30
Nabin Hait
cff91abd8d Merge pull request #4456 from nabinhait/drop_ship_fix1
[fix] Reload SO Item in patch
2015-12-09 17:06:54 +05:30
Nabin Hait
5d39a9594d [fix] Reload SO Item in patch 2015-12-09 17:06:09 +05:30
Nabin Hait
b1caeba0b4 Merge branch 'develop' 2015-12-09 15:32:30 +05:30
Nabin Hait
7290c79fdf bumped to version 6.12.8 2015-12-09 16:02:30 +06:00
Nabin Hait
547e916b00 Merge pull request #4452 from saurabh6790/drop-ship-fixes-3
[fixes] pull customer details only if drop shipping is marked
2015-12-09 15:31:49 +05:30
Nabin Hait
e4c0388b68 Merge pull request #4453 from nabinhait/translation_fix
suomalainen translation fixed for Extra Small
2015-12-09 15:30:11 +05:30
Nabin Hait
783e63a8e6 suomalainen translation fixed for Extra Small and Large 2015-12-09 15:29:21 +05:30
Saurabh
f6891975d5 [fixes] pull customer details only if drop shipping is marked 2015-12-09 15:04:12 +05:30
Nabin Hait
45a8f9d006 Merge branch 'develop' 2015-12-09 14:59:44 +05:30
Nabin Hait
1b0c797817 bumped to version 6.12.7 2015-12-09 15:29:44 +06:00
Nabin Hait
c119cbcb50 Merge pull request #4449 from nabinhait/coa_fix
[fix] Stock account identified in COA of Guatamala
2015-12-09 13:58:09 +05:30
Nabin Hait
d595534431 Merge pull request #4450 from venetanji/develop
Fix dynamic link in reports to generate correct link when user language is not english
2015-12-09 13:57:45 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Giovanni Lion
5ccaf6f9d7 Merge remote-tracking branch 'frappe/develop' into develop 2015-12-09 15:25:47 +08:00
Anand Doshi
29fe53f63c [fix] use pip parse requirements in setup.py 2015-12-09 12:15:22 +05:30
Nabin Hait
49fe7af6de [fix] Stock account identified in COA of Guatamala 2015-12-09 11:27:10 +05:30
Nabin Hait
a68a3b5cc1 Merge branch 'develop' 2015-12-08 18:06:25 +05:30
Nabin Hait
3931a35e27 bumped to version 6.12.6 2015-12-08 18:36:25 +06:00
Nabin Hait
56595ecda0 Merge pull request #4445 from nabinhait/patch_fix1
[patch][fix] Fixed drop ship status and tax rule patch
2015-12-08 18:05:33 +05:30
Nabin Hait
466ff3d31b Merge pull request #4446 from nabinhait/translation_fix
[fix] Hungary translation for chart of accounts
2015-12-08 18:05:12 +05:30
Nabin Hait
61c6552434 [fix] Hungary translation for chart of accounts 2015-12-08 18:03:23 +05:30
Nabin Hait
4ad0963ee8 [patch][fix] Fixed drop ship status and tax rule patch 2015-12-08 16:51:04 +05:30
Nabin Hait
aa99fe2c4e Merge branch 'develop' 2015-12-08 15:40:17 +05:30
Nabin Hait
d56ec92682 bumped to version 6.12.5 2015-12-08 16:10:17 +06:00
Nabin Hait
90852d334f Merge branch 'nabinhait-tax_rule_patch' into develop 2015-12-08 15:30:32 +05:30
Nabin Hait
694373d022 Fixed conflict 2015-12-08 15:30:15 +05:30
Nabin Hait
40d49ccf98 Merge pull request #4444 from nabinhait/get_incoming_rate_fix
[fix] Get incoming rate if args as json
2015-12-08 15:17:32 +05:30
Nabin Hait
4372ac559a Merge pull request #4443 from nabinhait/bank_reco_print
[fix] Print format for bank reco statement
2015-12-08 15:17:24 +05:30
Nabin Hait
01478b3fc1 Merge pull request #4439 from saurabh6790/drop-ship-fixes-3
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 15:16:38 +05:30
Nabin Hait
41c8cf645a [fix] Get incoming rate if args as json 2015-12-08 14:50:24 +05:30