Nabin Hait
|
539f352318
|
Delivery note to packing slip mapping
|
2014-06-16 15:03:36 +05:30 |
|
Nabin Hait
|
e1b2b3e995
|
Account common get_query
|
2014-06-16 15:03:36 +05:30 |
|
Rushabh Mehta
|
3b7bcf0f4f
|
make font size smaller for erpnext powered
|
2014-06-16 14:21:37 +05:30 |
|
Rushabh Mehta
|
03ae32d937
|
added print format for general ledger
|
2014-06-16 14:21:37 +05:30 |
|
Anand Doshi
|
ccf370f813
|
Fixed item query
|
2014-06-16 13:50:11 +05:30 |
|
Anand Doshi
|
0521814dea
|
Fixed item query
|
2014-06-16 13:25:20 +05:30 |
|
Anand Doshi
|
e35841a2ea
|
Reload Shopping Cart Settings in create price list patch
|
2014-06-16 12:59:54 +05:30 |
|
Anand Doshi
|
3474c273a5
|
Ignore mandatory in employee patch
|
2014-06-16 12:14:21 +05:30 |
|
Anand Doshi
|
3dc722b096
|
Create price list only if setup complete
|
2014-06-13 15:30:38 +05:30 |
|
Anand Doshi
|
c1bfb63d96
|
Create price list if missing
|
2014-06-13 12:41:08 +05:30 |
|
Anand Doshi
|
27e295a4cb
|
Merge pull request #1789 from nabinhait/v4-hotfix
V4 hotfix
|
2014-06-12 15:39:58 +05:30 |
|
Nabin Hait
|
f2202fc014
|
minor fix
|
2014-06-12 15:20:47 +05:30 |
|
Anand Doshi
|
3761ff3522
|
Fix in patch: split email settings
|
2014-06-12 15:00:52 +05:30 |
|
Anand Doshi
|
205438669a
|
Removed clear_custom_buttons, pos view switch fix
|
2014-06-12 15:00:51 +05:30 |
|
Nabin Hait
|
e7f2d3179d
|
update other_charges in custom print formats
|
2014-06-12 14:58:09 +05:30 |
|
Nabin Hait
|
46dc3b1442
|
validations added in stock entry
|
2014-06-12 12:48:28 +05:30 |
|
Nabin Hait
|
2128c98c35
|
available qty validation. Fixes #1045
|
2014-06-12 12:42:22 +05:30 |
|
Nabin Hait
|
e98b326ba3
|
Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
|
2014-06-12 12:25:23 +05:30 |
|
Rushabh Mehta
|
7bcd31bddb
|
Merge pull request #1785 from rmehta/develop
minor fix for outgoing communication email
|
2014-06-12 10:32:21 +05:30 |
|
Rushabh Mehta
|
6def968c3c
|
minor fix for outgoing communication email
|
2014-06-12 10:31:43 +05:30 |
|
Nabin Hait
|
589a298096
|
Minor fixes in salary manager. Fixes #1754
|
2014-06-11 13:00:31 +05:30 |
|
Anand Doshi
|
fdfea0c17b
|
Fixed Recurring Sales Invoice
|
2014-06-10 17:54:04 +05:30 |
|
Anand Doshi
|
862fe60368
|
Minor fix in newsletter
|
2014-06-10 17:15:50 +05:30 |
|
Nabin Hait
|
6a3e97a9f8
|
Merge pull request #1781 from anandpdoshi/hotfix
Reload sales taxes and charges in patch
|
2014-06-10 16:37:59 +05:30 |
|
Anand Doshi
|
7656377f3f
|
Show website route for generator via set_intro, fix in Support Email Settings
|
2014-06-10 15:48:37 +05:30 |
|
Anand Doshi
|
82029be6f9
|
Reload sales taxes and charges in patch
|
2014-06-10 14:52:49 +05:30 |
|
Nabin Hait
|
7425634692
|
minor fix in global defaults
|
2014-06-10 14:12:28 +05:30 |
|
Nabin Hait
|
6febfca5a6
|
changed insert after for india related custom fields
|
2014-06-10 11:21:38 +05:30 |
|
Nabin Hait
|
7cba72a0b7
|
Pricing Rule: price / discount percentage can not be negative
|
2014-06-10 11:09:21 +05:30 |
|
Nabin Hait
|
91016ba989
|
update custom print formats for renamed fields
|
2014-06-10 10:41:37 +05:30 |
|
Anand Doshi
|
b527e54809
|
Fixed report: Item wise Price List Rate
|
2014-06-09 18:08:46 +05:30 |
|
Anand Doshi
|
c01db5fe9c
|
Save default letterhead
|
2014-06-09 18:01:14 +05:30 |
|
Nabin Hait
|
d532d2f64f
|
create custom fields for india specific fields
|
2014-06-09 16:00:49 +05:30 |
|
Anand Doshi
|
af63d053b1
|
Also save Global Defaults in System Settings patch
|
2014-06-09 15:51:12 +05:30 |
|
Anand Doshi
|
be3f914acd
|
Fixed add address template
|
2014-06-09 15:18:45 +05:30 |
|
Anand Doshi
|
edb9efd9a6
|
Fixed manifest and website
|
2014-06-09 15:11:18 +05:30 |
|
Anand Doshi
|
cdfa9a371d
|
Export perm for GL Entry and Stock Ledger Entry
|
2014-06-09 15:11:17 +05:30 |
|
Anand Doshi
|
390efdc884
|
Fix in HR patch
|
2014-06-09 15:04:00 +05:30 |
|
Nabin Hait
|
b63e99eb43
|
Update tax amount after discount in existing documents
|
2014-06-09 12:49:09 +05:30 |
|
Anand Doshi
|
6f561aa846
|
Fixed HR patch
|
2014-06-06 22:10:18 +05:30 |
|
Anand Doshi
|
0aa125304d
|
Fixed Reset Permissions patch
|
2014-06-06 20:39:21 +05:30 |
|
Anand Doshi
|
482d29dc53
|
Fixed Purchase Receipt qty trigger
|
2014-06-06 20:34:08 +05:30 |
|
Anand Doshi
|
cd0aed993a
|
Fixed Address Template Patch
|
2014-06-06 17:37:31 +05:30 |
|
Anand Doshi
|
fc601659f5
|
Fixed Address Template
|
2014-06-06 17:07:50 +05:30 |
|
Anand Doshi
|
4a069a1e7f
|
Changed case in modules.txt
|
2014-06-06 16:28:03 +05:30 |
|
Anand Doshi
|
04badf7e6e
|
Hotfix: module name case for HR
|
2014-06-06 15:29:55 +05:30 |
|
Anand Doshi
|
171c00cfd6
|
Reload permissions for master and setting documents
|
2014-06-06 15:13:20 +05:30 |
|
Anand Doshi
|
b5cefa92fa
|
Improved Fiscal Year validation messages
|
2014-06-06 15:10:00 +05:30 |
|
Anand Doshi
|
8cead48342
|
Merge pull request #1756 from rmehta/develop
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-06 14:52:22 +05:30 |
|
Rushabh Mehta
|
1989e4fca0
|
Merge pull request #1755 from nabinhait/v4-hotfix
Fixes in trends report
|
2014-06-06 12:49:34 +05:30 |
|
Rushabh Mehta
|
880b3ef6c0
|
added qty updating option multi-item selector
|
2014-06-06 11:45:30 +05:30 |
|
Anand Doshi
|
2ec93590e4
|
Minor fix in address template
|
2014-06-06 11:45:30 +05:30 |
|
Anand Doshi
|
5fe69fb556
|
Fixes
|
2014-06-06 11:45:29 +05:30 |
|
Anand Doshi
|
290ed09dc6
|
Update new_address_template.py
|
2014-06-06 11:45:29 +05:30 |
|
Anand Doshi
|
65018daebc
|
Minor fix in address template
|
2014-06-05 18:33:26 +05:30 |
|
Rushabh Mehta
|
0739937fa2
|
bug: added empty class for sms settings
|
2014-06-05 18:15:00 +05:30 |
|
Anand Doshi
|
ede8ea52b0
|
Fixes
|
2014-06-05 18:06:20 +05:30 |
|
Rushabh Mehta
|
ba83e9cfbe
|
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-05 17:56:42 +05:30 |
|
Nabin Hait
|
977331806b
|
Set missing values only in unsubmitted documents
|
2014-06-05 17:55:00 +05:30 |
|
Nabin Hait
|
86207afe15
|
Set missing values only in unsubmitted documents
|
2014-06-05 17:55:00 +05:30 |
|
Nabin Hait
|
704a453b7a
|
Set missing values only in unsubmitted documents
|
2014-06-05 17:55:00 +05:30 |
|
Nabin Hait
|
b7438894f6
|
Fixes in trends report
|
2014-06-05 17:55:00 +05:30 |
|
Anand Doshi
|
4022586015
|
Update new_address_template.py
|
2014-06-05 17:34:59 +05:30 |
|
Rushabh Mehta
|
5036706f81
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c02fbd22fa
|
removed address_title from address and removed test
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
33020a63b8
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
eaa2e55d20
|
patch for address template fixes #1749
|
2014-06-05 16:16:13 +05:30 |
|
Rushabh Mehta
|
c22e11d483
|
added address template:
|
2014-06-05 16:01:55 +05:30 |
|
Rushabh Mehta
|
41471c3b44
|
fixed description in salary manager
|
2014-06-05 16:01:55 +05:30 |
|
Nabin Hait
|
c8be8ba42c
|
function renamed
|
2014-06-05 15:18:10 +05:30 |
|
Nabin Hait
|
4d4df03f88
|
Added total debit / credit row in trial balance. Fixes #1313
|
2014-06-04 19:00:57 +05:30 |
|
Nabin Hait
|
deb6e06336
|
minor fix
|
2014-06-04 19:00:56 +05:30 |
|
Nabin Hait
|
c3d1d6a946
|
cleanup raw materials supplied table for sub-contraction. Fixes #1743
|
2014-06-04 19:00:56 +05:30 |
|
Nabin Hait
|
1055139c83
|
get accounts for opening entry
|
2014-06-04 19:00:56 +05:30 |
|
Nabin Hait
|
19d1e499c3
|
Removed Purchase in transit report #1435
|
2014-06-04 19:00:56 +05:30 |
|
Nabin Hait
|
b161eea793
|
Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442
|
2014-06-04 18:57:53 +05:30 |
|
Anand Doshi
|
85479bcbc0
|
Fixes for apply user permissions and momentjs
|
2014-06-04 18:15:43 +05:30 |
|
Anand Doshi
|
ec8240e890
|
Apply User Permissions optional in Script and Query Reports
|
2014-06-04 17:48:58 +05:30 |
|
Anand Doshi
|
221dec8cac
|
transaction.js: calculate only if one entry in table
|
2014-06-04 17:48:57 +05:30 |
|
Anand Doshi
|
9a0f6f5bb4
|
Enable Scheduler in System Settings when Setup Wizard is completed
|
2014-06-04 17:48:57 +05:30 |
|
Anand Doshi
|
38dedf402b
|
Fixes in patches for migration
|
2014-06-04 17:48:56 +05:30 |
|
Anand Doshi
|
c280d0655c
|
Set Employee Name if missing
|
2014-06-04 17:48:56 +05:30 |
|
Anand Doshi
|
cdc1b640d9
|
Fixes in user permissions patches
|
2014-06-04 17:48:56 +05:30 |
|
Anand Doshi
|
37993dd713
|
Romanian and Korean Translations
|
2014-06-04 17:48:55 +05:30 |
|
Anand Doshi
|
cd25301607
|
Translations
|
2014-06-04 17:48:55 +05:30 |
|
Anand Doshi
|
4985691617
|
Role and User Permissions
|
2014-06-04 17:48:54 +05:30 |
|
Anand Doshi
|
69eec9e344
|
Role and User Permissions
|
2014-06-04 17:48:54 +05:30 |
|
Anand Doshi
|
a8ce570635
|
Permission relogication continued
|
2014-06-04 17:48:53 +05:30 |
|
Anand Doshi
|
fab0904af7
|
Started permission relogication
|
2014-06-04 17:48:52 +05:30 |
|
Anand Doshi
|
ffc28faa51
|
Merge pull request #1744 from rmehta/develop
added multiple item select and allow non purchase items in Material Requ...
|
2014-06-04 17:47:58 +05:30 |
|
Rushabh Mehta
|
b6843f2087
|
added multiple item select and allow non purchase items in Material Request of type transfer
|
2014-06-04 13:10:41 +05:30 |
|
Anand Doshi
|
3f6606acdb
|
Merge pull request #1702 from pdvyas/put-version-in-file
keep version in separate file
|
2014-06-04 12:28:37 +05:30 |
|
Nabin Hait
|
67d8b91690
|
Fixes in bank reconciliation statement
|
2014-06-04 11:18:25 +05:30 |
|
Nabin Hait
|
ce6977ffe6
|
Minor fixes in fetching item details
|
2014-06-03 23:02:02 +05:30 |
|
Nabin Hait
|
bc7efa6da6
|
Parent account mandatory for all non-root accounts
|
2014-06-03 23:02:02 +05:30 |
|
Nabin Hait
|
b15764ef2c
|
Translation issue fixed in analytics/grid report
|
2014-06-03 13:02:39 +05:30 |
|
Nabin Hait
|
abb62c76d8
|
Removed allocated to field from serach fields in support ticket
|
2014-06-03 10:50:55 +05:30 |
|
Nabin Hait
|
51b7f322cc
|
Closing balance fixes in trial balance. Fixes #1730
|
2014-06-02 18:47:46 +05:30 |
|
Anand Doshi
|
be99b1240c
|
Merge pull request #1722 from nabinhait/v4-hotfix
multiple fixes
|
2014-06-02 11:09:32 +05:30 |
|
Rushabh Mehta
|
430d132ee0
|
awesomebar: add tree links
|
2014-05-31 10:36:42 +05:30 |
|
Rushabh Mehta
|
cc37cc83cd
|
removed section_style
|
2014-05-31 10:36:41 +05:30 |
|
Nabin Hait
|
0984f227a8
|
minor fixes related to path
|
2014-05-30 19:10:12 +05:30 |
|
Nabin Hait
|
548cf96c44
|
Minor fixes in sales return
|
2014-05-30 19:09:59 +05:30 |
|
Nabin Hait
|
0be378af6a
|
Purchase ordered qty can not be less than minimum order qty. fixes #1529
|
2014-05-30 15:53:20 +05:30 |
|
Nabin Hait
|
fb988ba834
|
Salary Slip: pull details from salary struture. fixes #1719
|
2014-05-30 15:53:20 +05:30 |
|
Nabin Hait
|
e6ddd28067
|
Don't execute reorder_item, if initial setup not completed. fixes #1668
|
2014-05-30 15:53:20 +05:30 |
|
Nabin Hait
|
1897e75894
|
Remove blank lines from uploaded file of attendance #1714
|
2014-05-30 14:31:10 +05:30 |
|
Nabin Hait
|
c1367d9d10
|
minor fixes
|
2014-05-30 11:43:00 +05:30 |
|
Nabin Hait
|
cb9bdf43f6
|
over billing validation fixed
|
2014-05-30 11:22:16 +05:30 |
|
Nabin Hait
|
6b1a8e0a40
|
minor fixes
|
2014-05-30 11:22:16 +05:30 |
|
Nabin Hait
|
7f32cbeb06
|
Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
c7253b3a37
|
Get valuation rate for fg item base don issued item cost + operation cost. #1688
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
7f03e24c55
|
Valuation rate of raw materials in BOM. #1688
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
66cecf4824
|
uom trigger issue in stock entry fixes #1712
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
f3552ca737
|
packing slip fixes #1711
|
2014-05-30 11:22:15 +05:30 |
|
Nabin Hait
|
3dc6a80198
|
deleted delivery note packing list wise print format
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
e71159d6ea
|
Standard Rate field removed from item. Fixes #1688
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
732a7e81a0
|
Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706
|
2014-05-30 11:22:14 +05:30 |
|
Nabin Hait
|
c3cbe2a30c
|
minor fixes in sales invoice validation
|
2014-05-30 11:22:13 +05:30 |
|
Nabin Hait
|
9bc9b8795b
|
Fixes in stock reconciliation
|
2014-05-30 11:22:13 +05:30 |
|
Nabin Hait
|
d0605443fb
|
removed print statement
|
2014-05-30 11:22:13 +05:30 |
|
Nabin Hait
|
47a8670d37
|
pricing rule testcase fixes
|
2014-05-30 11:22:12 +05:30 |
|
Nabin Hait
|
e7546e2305
|
SMS Settings added in setup and selling module page. Fixes #1693
|
2014-05-30 11:22:12 +05:30 |
|
Nabin Hait
|
ccb9826afd
|
pricing list tets case fixes
|
2014-05-30 11:22:12 +05:30 |
|
Nabin Hait
|
8de61559b0
|
Minor fixes in sales / purchase analytics. Fixes #1701
|
2014-05-30 11:22:11 +05:30 |
|
Nabin Hait
|
ea4aa04cc4
|
Search query for account cleanup
|
2014-05-30 11:22:11 +05:30 |
|
Nabin Hait
|
a3dd72a759
|
Pricing Rule
|
2014-05-30 11:22:10 +05:30 |
|
Nabin Hait
|
62ec60188b
|
use build_filter_conditions from db_query. Fixes #1679
|
2014-05-30 11:22:10 +05:30 |
|
Anand Doshi
|
10cb4799bc
|
Merge pull request #1700 from rmehta/develop
Various UI Bug Fixes
|
2014-05-30 11:12:21 +05:30 |
|
Pratik Vyas
|
8e0438bad4
|
keep version in separate file
|
2014-05-28 16:58:55 +05:30 |
|
Pratik Vyas
|
76e48b5c3f
|
hotfix: update_account_root_type.py patch
|
2014-05-28 15:22:34 +05:30 |
|
Rushabh Mehta
|
1bf9df7c85
|
removed about
|
2014-05-28 13:15:32 +05:30 |
|
Anand Doshi
|
32063bb472
|
Removed designation 'Director' owing to problems with Greek translation
|
2014-05-27 22:40:53 +05:30 |
|
Rushabh Mehta
|
f944e819e9
|
fixes #1581 and added icons to grid reports
|
2014-05-27 15:22:04 +05:30 |
|
Nabin Hait
|
9c1ae09994
|
Merge pull request #1689 from rmehta/develop
fix to pos invoice
|
2014-05-26 16:22:03 +05:30 |
|
Rushabh Mehta
|
d82e85d099
|
fix to pos invoice
|
2014-05-26 16:01:01 +05:30 |
|
Nabin Hait
|
08dd6af446
|
Update status based on communication. Fixes #1682
|
2014-05-26 15:06:42 +05:30 |
|
Rushabh Mehta
|
a7c46e4d83
|
removed debug in query (packing_slip.py)
|
2014-05-26 13:35:47 +05:30 |
|
Rushabh Mehta
|
b15d760406
|
fix to packing slip (validation)
|
2014-05-26 13:05:19 +05:30 |
|
Rushabh Mehta
|
9f399f139b
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-26 11:40:46 +05:30 |
|
Rushabh Mehta
|
3b0f026522
|
fix to sales parter
|
2014-05-24 12:04:13 +05:30 |
|
Anand Doshi
|
8d321446ad
|
Updated translations
|
2014-05-23 10:29:37 +05:30 |
|
Anand Doshi
|
c783c2636f
|
Updated translations
|
2014-05-23 09:22:12 +05:30 |
|
Anand Doshi
|
5468740042
|
Fixed setup wizard errors for chinese simplified
|
2014-05-23 09:21:55 +05:30 |
|
Anand Doshi
|
69e4b16817
|
Setup Wizard: clear cache on language change
|
2014-05-22 22:52:36 +05:30 |
|
Pratik Vyas
|
e35a1025c9
|
hotfix: communication email bug
|
2014-05-22 18:37:55 +05:30 |
|
Rushabh Mehta
|
0f5601dad4
|
Merge pull request #1677 from rmehta/develop
Added title_field and added ignore_permission while creating Event from Lead
|
2014-05-22 11:23:03 +05:30 |
|
Anand Doshi
|
c57d7dea8b
|
Fixed global_defaults_to_system_settings
|
2014-05-22 11:05:46 +05:30 |
|
Rushabh Mehta
|
a39cae9c2e
|
added title field to support ticket, lead and employee
|
2014-05-21 17:34:22 +05:30 |
|
Nabin Hait
|
edf87a258f
|
Create serial no based on series only if item is serialized
|
2014-05-21 15:38:56 +05:30 |
|
Anand Doshi
|
d6007e7d9c
|
Hook: setup_wizard_success
|
2014-05-21 15:22:15 +05:30 |
|
Rushabh Mehta
|
92ce693e6f
|
added ignore_permission in Lead for creating Event
|
2014-05-21 14:59:56 +05:30 |
|
Nabin Hait
|
177fb132b9
|
description added in setup wizard
|
2014-05-21 12:39:37 +05:30 |
|
Nabin Hait
|
d811303d7b
|
minor fix
|
2014-05-21 12:36:43 +05:30 |
|
Nabin Hait
|
27b12ef1b6
|
update account root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
4efc5d74d4
|
Setup Wizard: company abbr length validation on onchange trigger
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
b5c552faf3
|
minor fix
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
dec02340e8
|
reload account doc in root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
3f80ef0648
|
reload account doc in root type patch
|
2014-05-21 11:53:59 +05:30 |
|
Nabin Hait
|
44ae408b36
|
Income/expense info in email digest
|
2014-05-21 11:53:58 +05:30 |
|
Nabin Hait
|
0e6554edc1
|
Root Type field added in account and patch for existing accoutns
|
2014-05-21 11:53:58 +05:30 |
|
Pratik Vyas
|
5873e50c50
|
Release 4.0.2
|
2014-05-20 16:42:01 +05:30 |
|
Pratik Vyas
|
98c09e2a91
|
Release v4.0.1
|
2014-05-20 16:17:22 +05:30 |
|
Nabin Hait
|
c49b7f8c63
|
minor fix
|
2014-05-20 15:07:18 +05:30 |
|
Nabin Hait
|
956d7868b5
|
removed print statement
|
2014-05-20 10:36:14 +05:30 |
|
Nabin Hait
|
85786f3071
|
Support ticket / lead status based on communication. Fixes #1645
|
2014-05-19 19:31:40 +05:30 |
|
Nabin Hait
|
2e0620e370
|
Server side onload functionality in multiple docs
|
2014-05-19 18:15:58 +05:30 |
|
Anand Doshi
|
6664af9557
|
Fixed multilingual UOM issue
|
2014-05-17 00:07:45 +05:30 |
|
Nabin Hait
|
e60853930b
|
traslation issue fixed in setup wizard and desktop
|
2014-05-16 19:56:43 +05:30 |
|
Nabin Hait
|
091b48168e
|
Journal voucher debit != credit #fraction issue
|
2014-05-16 19:56:43 +05:30 |
|
Nabin Hait
|
ad68d64d93
|
Leave approver select options in leave application and employee
|
2014-05-16 19:56:43 +05:30 |
|
Pratik Vyas
|
fa7444ec94
|
fix shipping rule test cases (copy name with copy_doc)
|
2014-05-16 15:19:51 +05:30 |
|
Pratik Vyas
|
3d8f8f68d8
|
Merge pull request #1652 from anandpdoshi/hotfix
Do not create Feed when frappe.flags.in_patch
|
2014-05-16 12:38:24 +05:30 |
|
Nabin Hait
|
a220e5d850
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:36:38 +05:30 |
|
Nabin Hait
|
ac3ba70ed9
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:25:57 +05:30 |
|
Nabin Hait
|
52b5c134fc
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:25:10 +05:30 |
|
Nabin Hait
|
5c50e213ac
|
Update global_defaults_to_system_settings.py
|
2014-05-15 18:18:32 +05:30 |
|
Nabin Hait
|
9419575126
|
Merged language patch with global_defaults_to_system_settings patch
|
2014-05-15 17:17:58 +05:30 |
|
Nabin Hait
|
d0a915c47a
|
Global Defaults to system settings. Fixes #1653
|
2014-05-15 16:42:23 +05:30 |
|
Nabin Hait
|
b5a8cab8df
|
Valuation Rate column in Stock Ledger report. Fixed #1633
|
2014-05-15 11:50:46 +05:30 |
|
Nabin Hait
|
bc7659ab90
|
Employee leave balance report fixes #1647
|
2014-05-15 11:37:12 +05:30 |
|
Anand Doshi
|
38d5424b21
|
Do not create Feed when frappe.flags.in_patch
|
2014-05-14 19:33:21 +05:30 |
|
Nabin Hait
|
ea7e3d6405
|
Clear default for price_list_currency
|
2014-05-14 18:52:06 +05:30 |
|
Anand Doshi
|
54b7962eb9
|
Pass frm to open_mapped_doc
|
2014-05-14 17:38:45 +05:30 |
|
Anand Doshi
|
39cc1df560
|
Fixes #1635, Stock Reconcilation
|
2014-05-14 15:10:00 +05:30 |
|
Anand Doshi
|
5ce287d611
|
Setup Wizard width fix for chrome
|
2014-05-14 13:31:11 +05:30 |
|
Anand Doshi
|
51ba6f816b
|
Fixed Setup Wizard
|
2014-05-13 21:02:47 +05:30 |
|
Anand Doshi
|
4c83e407a9
|
Changed Print Format files to lowercase
|
2014-05-13 17:58:30 +05:30 |
|
Pratik Vyas
|
b1f212d653
|
Merge pull request #1638 from anandpdoshi/hotfix
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
|
2014-05-13 17:38:30 +05:30 |
|
Anand Doshi
|
8fe0208fb6
|
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
|
2014-05-13 16:52:26 +05:30 |
|
Nabin Hait
|
03f3a8a2ef
|
Get taxes and charges records from matser. Fixes #1634
|
2014-05-13 16:38:31 +05:30 |
|
Nabin Hait
|
aade34b0c9
|
Reports and print formats modified for renamed fields
|
2014-05-13 16:12:37 +05:30 |
|
Nabin Hait
|
54f0d24d80
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-13 11:33:09 +05:30 |
|
Nabin Hait
|
b76061530e
|
Daily time log fixes #1614
|
2014-05-13 11:32:39 +05:30 |
|
Anand Doshi
|
d711209dde
|
Fixed patches.txt
|
2014-05-12 19:42:38 +05:30 |
|
Nabin Hait
|
b3bead2f06
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-12 17:46:02 +05:30 |
|
Nabin Hait
|
827480fd2b
|
import, export and report permission in account and pricing rule
|
2014-05-12 17:45:37 +05:30 |
|
Nabin Hait
|
0c54e2d0d0
|
4_0 patch dir renamed to v4_0
|
2014-05-12 17:44:55 +05:30 |
|
Rushabh Mehta
|
2fdb51f85e
|
fixes frappe/erpnext#1627
|
2014-05-12 17:32:36 +05:30 |
|
Rushabh Mehta
|
37f54f9a35
|
added description to letter head in setup wizard
|
2014-05-12 16:45:49 +05:30 |
|
Anand Doshi
|
02edae8fac
|
Added hook: setup_wizard_exception
|
2014-05-12 12:37:32 +05:30 |
|
Nabin Hait
|
bbfe2517ea
|
BOM validation message fixed
|
2014-05-11 18:27:07 +05:30 |
|
Nabin Hait
|
2f50b85f99
|
Test case fixes for serial no
|
2014-05-11 13:03:53 +05:30 |
|
Nabin Hait
|
0ff6e3a6bb
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-11 12:11:50 +05:30 |
|
Nabin Hait
|
75e50ee082
|
Fixes for subcontracting
|
2014-05-11 12:11:15 +05:30 |
|
Nabin Hait
|
6d5c248402
|
Test case fixes for serial no
|
2014-05-11 12:10:57 +05:30 |
|
Nabin Hait
|
5365108ef9
|
Test case fixes for pos setting
|
2014-05-11 12:10:17 +05:30 |
|
Nabin Hait
|
7e373010d7
|
Test case fixes in time log batch
|
2014-05-11 12:08:39 +05:30 |
|
Rushabh Mehta
|
409c8e9732
|
removed confirmation date validations (wtf)
|
2014-05-11 10:01:16 +05:30 |
|
Rushabh Mehta
|
75e11a7270
|
Merge pull request #1616 from pdvyas/migrate-3to4
3 to 4 migration fixes
|
2014-05-10 22:19:07 +05:30 |
|
Pratik Vyas
|
6e686224eb
|
fix patches
|
2014-05-10 22:17:04 +05:30 |
|
Pratik Vyas
|
95f558e7bc
|
fix update user properties patch
|
2014-05-10 22:16:39 +05:30 |
|
Rushabh Mehta
|
2667a50334
|
clear cache before running setup wizard
|
2014-05-09 19:20:31 +05:30 |
|
Rushabh Mehta
|
9591b8ec93
|
Merge pull request #1613 from anandpdoshi/deprecate-link-selects
Deprecate Select fields with options as link:
|
2014-05-09 14:09:51 +05:30 |
|
Anand Doshi
|
78e9c6ef70
|
Deprecate Select fields with options as link:
|
2014-05-09 13:36:13 +05:30 |
|
Nabin Hait
|
a5ac0149af
|
Merge pull request #1612 from pdvyas/migrate-3to4
3 to 4 migration
|
2014-05-09 12:07:11 +05:30 |
|
Pratik Vyas
|
34e36a233c
|
Patch changes for 3 to 4 migration
|
2014-05-09 12:01:25 +05:30 |
|
Nabin Hait
|
d64a952b5d
|
Stock reco: item and warehouse validation and translation fixes
|
2014-05-09 11:50:24 +05:30 |
|
Nabin Hait
|
966edff222
|
minor fix
|
2014-05-09 10:54:12 +05:30 |
|
Nabin Hait
|
344f4436f1
|
Create / update raw materials supplied table for sub-contracting
|
2014-05-08 19:08:20 +05:30 |
|
Nabin Hait
|
5d070753fd
|
Item managed batch-wise, can not be reconciled through stock reconciliation
|
2014-05-08 19:08:06 +05:30 |
|
Nabin Hait
|
844dd36ff9
|
PP tool: get items from SO based on item filter
|
2014-05-08 19:07:34 +05:30 |
|
Nabin Hait
|
3c5bc544ea
|
Serial no and batch no field added in purchase receipt item supplied table
|
2014-05-08 19:07:02 +05:30 |
|
Nabin Hait
|
227db769a0
|
Item valuation rate on material transfer based on fifo
|
2014-05-08 19:06:01 +05:30 |
|
Anand Doshi
|
0c85169539
|
Fixed clear cache for item page
|
2014-05-08 17:46:00 +05:30 |
|
Anand Doshi
|
3415cdb208
|
Merge pull request #1604 from anandpdoshi/bugfix-v4
Newsletter status display. Fixes #1593
|
2014-05-08 12:09:29 +05:30 |
|
Anand Doshi
|
08ef467fc6
|
Fixed moduleview language issue
|
2014-05-08 11:43:18 +05:30 |
|
Nabin Hait
|
e37b8e6682
|
fixed conflict
|
2014-05-07 19:20:56 +05:30 |
|
Nabin Hait
|
23649c6852
|
fixe in query.py
|
2014-05-07 19:18:15 +05:30 |
|
Anand Doshi
|
7e1b75a705
|
Newsletter status display. Fixes #1593
|
2014-05-07 18:44:02 +05:30 |
|
Anand Doshi
|
f410bd9bf9
|
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
|
2014-05-07 17:20:42 +05:30 |
|
Nabin Hait
|
706eb7f2c7
|
fixed conflict
|
2014-05-07 15:13:52 +05:30 |
|
Nabin Hait
|
90f2d8d9fc
|
minor fix
|
2014-05-07 14:55:09 +05:30 |
|
Anand Doshi
|
dc644c37e6
|
Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
Naming series by fiscal year
|
2014-05-07 11:06:36 +05:30 |
|
Anand Doshi
|
4b438eee6d
|
Revert "Autocreate naming series options based on Fiscal Year"
This reverts commit 8a6febbaa5.
|
2014-05-07 10:58:39 +05:30 |
|
Anand Doshi
|
8a6febbaa5
|
Autocreate naming series options based on Fiscal Year
|
2014-05-06 19:44:22 +05:30 |
|
Anand Doshi
|
8c2dbab878
|
Changed default naming series options
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
|
2014-05-06 19:43:11 +05:30 |
|
Nabin Hait
|
3fcec56f7b
|
Bulk rename tool fixes #1594
|
2014-05-06 19:13:46 +05:30 |
|
Nabin Hait
|
a521343063
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-06 18:53:02 +05:30 |
|
Nabin Hait
|
ce4a87ce83
|
Maintenance schedule: get no of visits and period validation. Fixes #1591
|
2014-05-06 18:52:36 +05:30 |
|
Anand Doshi
|
7fc9b63dc7
|
Merge pull request #1590 from anandpdoshi/remove-india-specific-fields
Remove India specific fields
|
2014-05-06 16:48:18 +05:30 |
|
Nabin Hait
|
50e962b279
|
Special characters allowed in company name. Fixes #1259
|
2014-05-06 16:46:32 +05:30 |
|
Anand Doshi
|
4b7a6b13ec
|
Additions to remove India specific fields
|
2014-05-06 16:41:31 +05:30 |
|
Nabin Hait
|
3190f99ebe
|
Option for selecting already reconciled entries in bank reconciliation #1310
|
2014-05-06 16:39:24 +05:30 |
|
Anand Doshi
|
37909b292f
|
Remove India specific fields
|
2014-05-06 16:15:56 +05:30 |
|
Nabin Hait
|
5c82014ba9
|
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
|
2014-05-06 14:01:30 +05:30 |
|
Nabin Hait
|
c82e967e97
|
Cannada translation
|
2014-05-06 14:01:04 +05:30 |
|
Nabin Hait
|
b63384b3d4
|
Merge pull request #1588 from nabinhait/v4-hotfix
Allow Rename option added in multiple docs. Fixes #1521
|
2014-05-06 12:34:50 +05:30 |
|
Nabin Hait
|
02d37bbb5a
|
Allow Rename option added in multiple docs. Fixes #1521
|
2014-05-06 12:18:50 +05:30 |
|
Anand Doshi
|
728be8c4d4
|
Merge pull request #1587 from anandpdoshi/bugfix-v4
Enable frequently used currencies. Fixes #1561
|
2014-05-06 12:18:37 +05:30 |
|
Anand Doshi
|
de560aa094
|
Enable frequently used currencies. Fixes #1561
|
2014-05-06 12:02:23 +05:30 |
|
Nabin Hait
|
b1285f9fce
|
Time Log Batch creation from time log list
|
2014-05-06 11:58:00 +05:30 |
|
Nabin Hait
|
cea4cd4e5f
|
Pull stock entry difference account from company
|
2014-05-06 11:57:33 +05:30 |
|
Pratik Vyas
|
4d911db902
|
Release 4.0.0
|
2014-05-05 19:14:45 +05:30 |
|
Nabin Hait
|
b99a3517c3
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-05 18:42:07 +05:30 |
|
Nabin Hait
|
98c2a052e5
|
Fixes in pricing rule testcases #565
|
2014-05-05 18:41:41 +05:30 |
|
Nabin Hait
|
ac1bc212ea
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-05 18:27:31 +05:30 |
|
Anand Doshi
|
91b451b8ce
|
Updated validate v3 patch
|
2014-05-05 18:25:37 +05:30 |
|
Anand Doshi
|
648062d071
|
Fixes in test cases
|
2014-05-05 16:46:38 +05:30 |
|
Nabin Hait
|
f2db87a766
|
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
|
2014-05-05 15:04:55 +05:30 |
|
Nabin Hait
|
53dab55703
|
Pricing Rule: if multiple rules, ask to resolve conflict #565
|
2014-05-05 14:49:40 +05:30 |
|
Nabin Hait
|
0c7e28ec9f
|
Pricing Rule improvements #565
|
2014-05-05 11:13:36 +05:30 |
|
Nabin Hait
|
ed8a845e83
|
POS Make Payment dialog box fix #1441
|
2014-05-05 11:01:32 +05:30 |
|
Nabin Hait
|
d5886f36af
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-05 10:28:20 +05:30 |
|
Nabin Hait
|
f57f0a661a
|
Stock Entry: pulling items from BOM fixed #1579
|
2014-05-05 10:27:53 +05:30 |
|
Anand Doshi
|
69e0cb5d6f
|
Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573
|
2014-05-04 19:37:45 +05:30 |
|
Nabin Hait
|
6dad4e9e89
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-04 16:02:44 +05:30 |
|
Nabin Hait
|
a096b2004f
|
Financial analytics graph fix #1542
|
2014-05-04 16:02:26 +05:30 |
|
Anand Doshi
|
4ab5382d3f
|
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
|
2014-05-04 11:50:10 +05:30 |
|
Rushabh Mehta
|
24a3ec57e3
|
update to tests
|
2014-05-03 16:22:46 +05:30 |
|
Anand Doshi
|
75042fd502
|
Show Activity entries based on permissions. Completely fixes #1481
|
2014-05-02 19:44:28 +05:30 |
|
Anand Doshi
|
2b0e4266cf
|
Go to home page on clicking left arrow in note list
|
2014-05-02 19:43:11 +05:30 |
|
Anand Doshi
|
ef5407479a
|
Show Chart of Accounts in Accounts > Documents. Fixes #1559
|
2014-05-02 19:42:27 +05:30 |
|
Anand Doshi
|
56f29cbb27
|
Fixed contact page response. Fixes #1557
|
2014-05-02 18:17:39 +05:30 |
|
Nabin Hait
|
232954d4b9
|
Fixed updating cost on BOM after submission #1563
|
2014-05-02 17:51:24 +05:30 |
|
Nabin Hait
|
053a87edf6
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 17:37:38 +05:30 |
|
Nabin Hait
|
296d626e53
|
Back flush issue fixed in sub contracting #1567
|
2014-05-02 17:36:13 +05:30 |
|
Nabin Hait
|
bc83b9c1ac
|
minor fix
|
2014-05-02 17:03:18 +05:30 |
|
Anand Doshi
|
b71a18cd1e
|
Leave Allocation Tool and Employee. Fixes #1555
|
2014-05-02 16:23:51 +05:30 |
|
Nabin Hait
|
2cebf9b499
|
minor fix #1565
|
2014-05-02 16:12:07 +05:30 |
|
Nabin Hait
|
ef30932807
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 15:45:52 +05:30 |
|
Nabin Hait
|
6b03914731
|
asynchronus issue in get_party_details
|
2014-05-02 15:45:10 +05:30 |
|
Anand Doshi
|
f29bcaf436
|
Added new fixtures (Fixes #1540). Removed Employee Grade from HR.
|
2014-05-02 13:55:07 +05:30 |
|
Rushabh Mehta
|
4ceb20e07f
|
hooks.txt -> hooks.py
|
2014-05-02 12:15:11 +05:30 |
|
Nabin Hait
|
1e6c32e95f
|
Address and contact creation from opportunity #1570
|
2014-05-02 11:42:24 +05:30 |
|
Nabin Hait
|
92c4fc4e19
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 10:27:17 +05:30 |
|
Nabin Hait
|
d341254786
|
Purchase receipt to purchase invoice item
|
2014-05-01 17:42:21 +05:30 |
|
Anand Doshi
|
51e6d2228d
|
Salary Slip - read permission for Employee. Fixes #1553
|
2014-05-01 16:28:13 +05:30 |
|
Nabin Hait
|
292a254bc1
|
payment to invoice matching tool disabled temporarily
|
2014-05-01 15:46:37 +05:30 |
|
Nabin Hait
|
5b98340d15
|
payment to invoice matching
|
2014-05-01 15:43:22 +05:30 |
|
Nabin Hait
|
e5bd955f4d
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-01 09:56:14 +05:30 |
|
Anand Doshi
|
d9f0f27cd4
|
Fixes in test cases
|
2014-04-30 22:16:25 +05:30 |
|
Nabin Hait
|
dcfad4f645
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-30 20:32:07 +05:30 |
|
Nabin Hait
|
613919325d
|
Fixes in link field queries
|
2014-04-30 20:30:33 +05:30 |
|
Rushabh Mehta
|
a15164750d
|
started client side testing using selenium and other related and unrelated fixes
|
2014-04-30 19:39:13 +05:30 |
|
Nabin Hait
|
b85a9108eb
|
Payment to invoice matching tool
|
2014-04-30 19:32:16 +05:30 |
|
Nabin Hait
|
498ecfc192
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-30 19:31:22 +05:30 |
|
Nabin Hait
|
576f025c84
|
Payment to invoice matching tool
|
2014-04-30 19:30:50 +05:30 |
|
Anand Doshi
|
a47bf2ab66
|
Removed check for duplicate in sales bom, set default income account in Company
|
2014-04-30 18:54:05 +05:30 |
|
Anand Doshi
|
f62da519d6
|
Sales BOM Parent Item search - Fixes #1544
|
2014-04-30 16:50:39 +05:30 |
|