Commit Graph

15405 Commits

Author SHA1 Message Date
Nabin Hait
ca90963d5b Redesigned budgets 2016-05-23 13:04:26 +05:30
Nabin Hait
b9bc7d6df3 [feature] New document for Budget 2016-05-23 13:04:26 +05:30
Nabin Hait
05997b9138 Merge pull request #5380 from rohitwaghchaure/hotfix_material_request_issue
[Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item
2016-05-23 12:31:17 +05:30
Nabin Hait
434ae21785 Merge pull request #5384 from fderyckel/patch-3
minor edits
2016-05-23 10:43:58 +05:30
Maxwell Morais
498cc58522 get_address_display cannot be called directly
The new function get_address_display dont allow directly call, since it dont support, `frm, cdt, cdn` as arguments
2016-05-22 20:19:30 -03:00
François
dfc0a30e69 minor edits 2016-05-22 14:22:02 +02:00
Rohit Waghchaure
62dbbfba0d [Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item 2016-05-20 17:09:29 +05:30
Rushabh Mehta
ac123c57f3 [cleanup] website / portal css 2016-05-20 16:37:14 +05:30
Nabin Hait
04f3286c04 Update company.py 2016-05-20 15:47:56 +05:30
Saurabh
31c0d43b95 [fix] update setup wizard access 2016-05-20 15:30:00 +05:30
Nabin Hait
66ee4d8cd7 Merge branch 'master' into develop 2016-05-20 15:15:21 +05:30
Nabin Hait
6558e1dd80 Merge branch 'hotfix' 2016-05-20 15:15:20 +05:30
Nabin Hait
a54a2a99f4 bumped to version 6.27.19 2016-05-20 15:45:20 +06:00
Nabin Hait
eb04405d6b Merge pull request #5377 from nabinhait/setup_wizard_access
[hotfix] setup wizard access
2016-05-20 15:13:28 +05:30
Nabin Hait
d112417301 [hotfix] setup wizard access 2016-05-20 15:12:45 +05:30
Rushabh Mehta
d2a51d47d8 Merge pull request #5375 from rohitwaghchaure/editable_fields_overriding_issue
[Fixes] material request's editable fields overriding with purchase common
2016-05-20 14:11:19 +05:30
Rohit Waghchaure
6c60c164f1 [Fixes] material request's editable fields overriding with purchase common 2016-05-20 14:03:09 +05:30
Rushabh Mehta
d0cee1b61b [fix] minor fixes to pos 2016-05-20 12:54:59 +05:30
Rushabh Mehta
40b3a5bcc4 [optimize] communication query for heatmap 2016-05-20 12:54:59 +05:30
Nabin Hait
563bd056d7 Merge branch 'master' into develop 2016-05-20 12:18:28 +05:30
Nabin Hait
de974c684c Merge branch 'hotfix' 2016-05-20 12:18:27 +05:30
Nabin Hait
6c5a9bbe6b bumped to version 6.27.18 2016-05-20 12:48:27 +06:00
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-20 12:06:22 +05:30
Nabin Hait
2edf6b84d6 Merge pull request #5364 from rohitwaghchaure/setup_wizard_access_issue
[Fix] Restrict access to setup wizard page if setup is already completed
2016-05-20 11:40:00 +05:30
Nabin Hait
5dfcfc5606 Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco
[fixes] set default bank account in bank reconciliation statement report
2016-05-20 11:36:44 +05:30
Nabin Hait
baf3e3721f Merge pull request #5371 from saurabh6790/reset_user_must_always_select_on_transaction_change
[fixes] Reset "User must always select" on change of transaction
2016-05-20 11:36:06 +05:30
Nabin Hait
58e493ad51 Merge pull request #5372 from rohitwaghchaure/setup_wizard_translation_issue
[Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation
2016-05-20 11:35:53 +05:30
Nabin Hait
a1f7e070ec Merge pull request #5373 from rohitwaghchaure/tax_rule_fixes
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
2016-05-20 11:35:37 +05:30
Anand Doshi
1d88c6a742 [fix] [patch] home page + erpnext.css 2016-05-20 10:42:04 +05:30
Rushabh Mehta
532eedf411 [enhance] more editable grids 2016-05-19 18:22:49 +05:30
Rohit Waghchaure
9333b6208a [Translation] [Fix] Exception in setup wizard, item attributes Large and Extra Large has same translation 2016-05-19 17:01:49 +05:30
Rohit Waghchaure
d818bcd888 [Fixes] tax rule, tax rule working even if tax template inside the rule is disabled. 2016-05-19 16:53:01 +05:30
Saurabh
c0c8af06da [fixes] set default bank account in bank reconciliation statement report 2016-05-19 12:32:08 +05:30
Saurabh
dc16b7e34a [fixes] Reset on change of transaction 2016-05-19 12:26:40 +05:30
Rushabh Mehta
35047ac283 [ux] direct editing in material request 2016-05-18 18:17:38 +05:30
Kanchan Chauhan
adad5fb11e [Minor Fix] Job Opening should not require login 2016-05-18 16:33:29 +05:30
Rohit Waghchaure
d2e02a3023 [Fix] Restrict access to setup wizard page if setup is already completed 2016-05-18 14:52:57 +05:30
Nabin Hait
1daebc04d0 Merge pull request #5360 from neilLasrado/hotfix
Fixed reports
2016-05-18 10:39:19 +05:30
Anand Doshi
e13c3ad048 [fix] [patch] homepage 2016-05-18 01:46:23 +05:30
Neil Trini Lasrado
4668a69cf5 Fixed reports 2016-05-17 19:04:08 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Nabin Hait
a09285122f Added root type for Income. Fixes #5356 2016-05-17 10:37:31 +05:30
Anand Doshi
0d66260d31 [fix] [patch] update home page 2016-05-17 10:21:08 +05:30
Rushabh Mehta
a484ff751b Merge pull request #5353 from MaxMorais/patch-4
Small improvement in maintenance scheduler
2016-05-16 14:56:17 +05:30
Maxwell Morais
92b0be93c7 Removed HTML tags from messages
Remove HTML from messages
2016-05-16 06:24:55 -03:00
Maxwell Morais
89fdbdf404 Translation improvements
Translation improvements
2016-05-16 06:08:51 -03:00
Maxwell Morais
52a66fc90b Reduce start and end date verification
Given the actual scenario, that verify if the start_date <= end_date, do schedule a Maintenance, 2 days are required, but in many cases only one day is required!
2016-05-16 06:06:59 -03:00
Maxwell Morais
4e7b52952e Added warning
Added a warning to show a information to the active user
2016-05-16 05:38:04 -03:00
Rushabh Mehta
72615977d7 Merge pull request #5337 from rohitwaghchaure/pos
[WIP] [POS] Some changes and fixes
2016-05-16 12:06:42 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains
Domainifying
2016-05-16 12:02:51 +05:30