Commit Graph

8142 Commits

Author SHA1 Message Date
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
af7d929386 [minor] fix supplier/customer and editable columns in BOM 2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136 [BUG] Fix Create Material Request OperationalError
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
2016-06-01 08:31:05 -07:00
shreyas
3b79f19614 [Fix] Allow user to quantity in fraction while transferring material using production order 2016-06-01 17:45:10 +05:30
Nabin Hait
9f98296c9c minor fix 2016-06-01 16:21:43 +05:30
Rushabh Mehta
7db1793543 [fix] notification control UX - add update to top, fixes #5349 2016-06-01 13:24:28 +05:30
Nabin Hait
2460ee897a Merge pull request #5367 from KanchanChauhan/job_openings_public
[Minor Fix] Job Opening should not require login
2016-06-01 13:18:26 +05:30
Nabin Hait
8e4ec8d84a Merge pull request #5416 from nabinhait/tax_rule_based_on_county
Tax Rule based on County
2016-06-01 13:09:53 +05:30
Nabin Hait
cc07148336 Merge pull request #5428 from ShashaQin/patch-21
Update fiscal_year.py
2016-06-01 12:58:13 +05:30
Nabin Hait
29d85b0ab8 test case fixed 2016-06-01 12:54:26 +05:30
Nabin Hait
9a5cf6000e [fix] Test cases and editable fields settings for request for quotation 2016-06-01 12:54:26 +05:30
Nabin Hait
4eaeda710d Tax Rule based on County 2016-06-01 12:54:26 +05:30
Rushabh Mehta
535f3b0975 [minor] make task editable in project and add description to designation fixing #5361 2016-06-01 12:52:50 +05:30
Rushabh Mehta
277cda195c [fix] for #5419 2016-06-01 12:29:08 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
ShashaQin
5dd72fe196 Update fiscal_year.py 2016-06-01 11:39:53 +08:00
Nabin Hait
919b1b9d5b Merge pull request #5408 from neilLasrado/hotfix-2
Fixed error in Gross Profit report
2016-05-31 17:41:19 +05:30
Nabin Hait
54f723b654 Merge pull request #5413 from kressi/patch-1
[doc] fixed typo
2016-05-31 17:40:54 +05:30
Nabin Hait
7ab088ed3f Merge pull request #5414 from nabinhait/journal_entry_ux
Fetch party info in Journal Entry on selection of reference Invoice
2016-05-31 17:38:22 +05:30
Nabin Hait
6a110331e8 Merge pull request #5415 from nabinhait/company_permissions_fix
Ignore permissions for account/warehouse creation from Company
2016-05-31 17:38:08 +05:30
Nabin Hait
bb502f8588 Merge pull request #5417 from nabinhait/grid_editable_fields
[fix] Enabled editable fields in Budget
2016-05-31 17:37:36 +05:30
Nabin Hait
b0f7e5b23f Merge pull request #5424 from shreyasp/issue/delete-root-account
[Fix] User allowed to delete the root account in Chart of Accounts
2016-05-31 17:37:08 +05:30
shreyas
2bb845e53f [Fix] User allowed to delete the root account in Chart of Accounts 2016-05-31 17:15:28 +05:30
Rushabh Mehta
0dcb861b56 [minor] 2016-05-31 07:22:51 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
37c53f0a04 [fix] Enabled editable fields in Budget 2016-05-30 18:20:31 +05:30
Nabin Hait
f169e5c04d Ignore permissions for account/warehouse creation from Company 2016-05-30 12:15:36 +05:30
Nabin Hait
9fdd37e1ad Fetch party info in Journal Entry on selection of reference Invoice 2016-05-30 11:49:16 +05:30
Michael Kressibucher
f96ec0950d [doc] fixed typo 2016-05-29 17:57:37 +02:00
Neil Trini Lasrado
efccb8a704 Fixed error in Gross Profit report 2016-05-27 13:24:02 +05:30
Neil Trini Lasrado
45328f7729 Fixed error in bom autoname 2016-05-27 13:04:20 +05:30
Nabin Hait
a60ceba6d4 [fix] reload gl entry doctype in patch 2016-05-27 12:44:18 +05:30
Nabin Hait
0014aa9c26 [fix] Charts in report 2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
37b5e0c99f Merge pull request #5399 from nabinhait/report-graph
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 17:42:36 +05:30
Nabin Hait
1ade5927c4 fixed conflict 2016-05-26 16:56:30 +05:30
Nabin Hait
01eb7d02cc bumped to version 6.27.21 2016-05-26 17:25:34 +06:00
Nabin Hait
5af737dd67 Update sales_order.py 2016-05-26 16:54:25 +05:30
Anand Doshi
07dfb475ca [fix] newsletter progress percentage 2016-05-26 16:41:14 +05:30
Anand Doshi
ac7c81bb98 [fix] compiled erpnext.less to erpnext.css 2016-05-26 16:41:04 +05:30
Nabin Hait
310d64d565 Fixed conflict 2016-05-26 16:10:02 +05:30
Nabin Hait
c5d186c497 bumped to version 6.27.20 2016-05-26 16:15:34 +06:00
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b Line/Bar chart in Balance Sheet / Profit and Loss statement 2016-05-26 15:26:01 +05:30
Nabin Hait
28bdff5a55 Pie chart for ageing analysis in accounts receivale/payable 2016-05-26 15:26:01 +05:30
Nabin Hait
8ed2f87480 Update company.py 2016-05-25 20:06:24 +05:30
Rohit Waghchaure
f2aa1764cc [POS] enhancement and minor fixes 2016-05-25 15:04:46 +05:30
Saurabh
ed0816832d [enhance] ux fixes for payment request, added jinja for payment request message 2016-05-25 11:55:30 +05:30
Rushabh Mehta
1885645d6d [fix] [patch] 2016-05-24 16:10:21 +05:30
Rushabh Mehta
c96c4d6424 [minor] ignore xss in email sender 2016-05-24 16:02:49 +05:30
Rushabh Mehta
b574658c93 [minor] allow any time logs to be batched, fixes #5386 2016-05-24 12:13:31 +05:30
Nabin Hait
40d63d0675 Merge pull request #5378 from saurabh6790/hotfix
[fix] update setup wizard access
2016-05-24 11:47:31 +05:30
Saurabh
e450490bfb [document] document for cheque print 2016-05-24 10:28:16 +05:30
Saurabh
81501ddc6d [fixes] add setting to mark cheque account pay only 2016-05-24 10:28:14 +05:30
Saurabh
2fc0ffad34 [fixes] js templating to get cheque print view 2016-05-24 10:28:14 +05:30
Saurabh
9ca9f2d551 [Fixes] UX fixes 2016-05-24 10:28:14 +05:30
Saurabh
bb95d36218 [fixes] field re-structuring 2016-05-24 10:28:14 +05:30
Saurabh
1b62ecea44 [enhancement] cheque print 2016-05-24 10:28:14 +05:30
Nabin Hait
79ddf67289 Merge pull request #5362 from nabinhait/budget
Budgeting
2016-05-23 17:56:42 +05:30
Rushabh Mehta
3b10619aef Merge pull request #5391 from rohitwaghchaure/posting_date
Added today as default in transactions.
2016-05-23 17:55:22 +05:30
Nabin Hait
8f70370457 Chart of accounts fixed for Spain 2016-05-23 17:41:51 +05:30
Nabin Hait
03b08e7a91 [fix] Period closing voucher 2016-05-23 16:28:39 +05:30
Rohit Waghchaure
bc894428ca Added today as default in transaction. 2016-05-23 15:22:36 +05:30
Nabin Hait
832988e2fd test case fixed 2016-05-23 13:04:26 +05:30
Nabin Hait
d9117cb726 reload budget doctype in patch 2016-05-23 13:04:26 +05:30
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
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
a54a2a99f4 bumped to version 6.27.19 2016-05-20 15:45:20 +06:00
Nabin Hait
d112417301 [hotfix] setup wizard access 2016-05-20 15:12:45 +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
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
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
Rushabh Mehta
dc997dc426 Merge pull request #5352 from fderyckel/patch-2
Update multi-currency-accounting.md
2016-05-16 12:02:23 +05:30
Rushabh Mehta
9f5ff9476e Merge pull request #5342 from rohitwaghchaure/support_week_2
[Fix] Removed is_pro_applicable
2016-05-16 12:02:01 +05:30
Rushabh Mehta
d474e0cb5b Merge pull request #5345 from nabinhait/coa
Changes related for charts builder
2016-05-16 12:01:32 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Rushabh Mehta
03578620e0 Merge pull request #5338 from fderyckel/patch-1
Update make-field-visible-in-print-format.md
2016-05-16 12:00:15 +05:30
Rushabh Mehta
a9e3936b20 Merge pull request #5335 from neilLasrado/patch-1
Update manufacturing-settings.md
2016-05-16 11:57:48 +05:30
Rushabh Mehta
6471e178f6 Merge pull request #5321 from rohitwaghchaure/rfq_fixes
[Fixes] RFQ minor fixes
2016-05-16 11:57:35 +05:30
Rushabh Mehta
c93caee284 Merge pull request #5265 from ShashaQin/patch-46
Update opportunity.py
2016-05-16 11:56:32 +05:30
Rushabh Mehta
02f76dc0f9 [patch] [fix] 2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496 [patch] [fix] 2016-05-16 11:41:29 +05:30
Rushabh Mehta
7c96dc1783 [minor] [fix] cart 2016-05-16 11:36:08 +05:30
Maxwell Morais
28453efece Small improvement in maintenance scheduler
This improvement is intended to start disable blocking Maintenance Schedule submit, when the `Sales Person` does not have a `user_id` in the Employee!

The old logic try to use the `sales_person` email_id or the `owner` to create the event, but due some fails in the code, it dont occurs!
2016-05-16 00:50:03 -03:00
François
0802c56625 Update multi-currency-accounting.md 2016-05-15 20:21:08 +02:00
Rushabh Mehta
c8b2a9d654 [patch] [fix] 2016-05-15 10:08:52 +05:30
Anand Doshi
a5e4dc85db Merge pull request #5341 from rohitwaghchaure/support_week_1
[Fix] Warranty claim form, unexpected token illegal error
2016-05-14 13:16:48 +05:30
Anand Doshi
97a70b226a Merge pull request #5332 from anandpdoshi/fix/validate-account-company
[fix] Validate Company in Account autoname
2016-05-14 13:10:42 +05:30
kressi
0179909db2 Merge branch 'develop' into docfix 2016-05-13 15:40:33 +02:00
kressi
472a84ab13 fixed broken links and links to content in different language 2016-05-13 15:22:22 +02:00
Umair Sayyed
e44d1430e1 fixes in domainification. Also reordered some fields in BOM 2016-05-13 18:31:20 +05:30
kressi
28737b6808 fixed formatting and punctuation 2016-05-13 14:37:42 +02:00
Umair Sayyed
90cea14ce3 domanifying EPRNext, fixes #5334 2016-05-13 18:06:17 +05:30
Umair Sayyed
99f7528578 domanifying ERPNext via #5334 2016-05-13 18:06:17 +05:30
Rushabh Mehta
9c6c0d2836 [patch] [fix] 2016-05-13 17:50:33 +05:30
kressi
e7c773310b fixed typos and inconsistencies 2016-05-13 13:20:25 +02:00
Rushabh Mehta
d774f40497 remove print in homepage 2016-05-13 16:21:37 +05:30
Nabin Hait
665568d87e ignore permissions while creating records from charts builder portal 2016-05-13 15:56:11 +05:30
Nabin Hait
a21f49dd94 Tax rate in chart of accounts 2016-05-13 15:56:11 +05:30
Nabin Hait
e4670a9a45 Cleaned up chart of accounts 2016-05-13 15:56:11 +05:30
Michael Kressibucher
c53df03262 fixed typo 2016-05-12 15:14:52 +02:00
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rohit Waghchaure
a92560c851 [Fix] Warranty claim form, unexpected token illegal error 2016-05-12 16:30:56 +05:30
Rushabh Mehta
48c7658aee [minor] added set_value in domainify 2016-05-12 16:26:01 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Nabin Hait
825070e504 Merge pull request #5331 from nabinhait/multi-fix-55
Multiple fixes
2016-05-12 12:27:42 +05:30
François
d9f7364289 Update make-field-visible-in-print-format.md
Change a few typo
2016-05-12 06:32:40 +02:00
Rohit Waghchaure
29c7876e87 [Fixes] RFQ minor fixes 2016-05-11 19:38:29 +05:30
Neil Trini Lasrado
0b1d7c032a Update manufacturing-settings.md 2016-05-11 16:47:55 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Anand Doshi
19fec06366 [fix] Validate Company in Account autoname 2016-05-11 13:27:18 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
a1fcded0ba bumped to version 6.27.17 2016-05-11 13:13:39 +06:00