Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,574 Commits 3 Branches 0 Tags 1 GiB
ed3dc56da4
Commit Graph

7574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
ed3dc56da4 [minor] Ignore permission while updating profile from employee 2013-10-28 19:59:44 +05:30
Nabin Hait
a5bd3dd207 [fix] [minor] update finished goods against production order 2013-10-28 19:59:43 +05:30
Pratik Vyas
de4b720912 remove changing of memcached user in install_erpnext.py 2013-10-28 18:43:34 +05:30
Pratik Vyas
f4081c8130 remove changing of memcached user in install_erpnext.py 2013-10-28 14:43:00 +05:30
Pratik Vyas
297041ed3e Merge remote-tracking branch 'upstream/wsgi' into HEAD 
Conflicts:
	public/js/complete_setup.js
	setup/doctype/setup_control/setup_control.py
 2013-10-25 14:07:48 +05:30
Pratik Vyas
fe44d27d7f new install_erpnext.py, first cut 2013-10-25 00:21:07 +05:30
Anand Doshi
7fa2ec40e1 Removed Update Manager 2013-10-24 20:47:35 +05:30
Nabin Hait
96333b6bc7 [minor] try block in serial no status patch 2013-10-24 17:41:52 +05:30
Nabin Hait
3898777c9f [minor] validation message in serial no 2013-10-24 17:36:02 +05:30
Nabin Hait
e36edc14f6 [minor] try block in serial no status patch 2013-10-24 17:30:20 +05:30
Nabin Hait
101a097e44 [fix] [minor] ignore permission on setting values in control panel 2013-10-24 15:33:55 +05:30
Nabin Hait
8f185b7d3b [fix] [minor] patches 2013-10-24 14:55:29 +05:30
Nabin Hait
05ff7cbd90 [fix] [minor] translation issue in startup 2013-10-24 14:50:03 +05:30
Nabin Hait
dc08fdfc99 Merge pull request #1000 from akhileshdarjee/master 
[fix] added country and time zone to global defaults
 2013-10-24 01:58:33 -07:00
Akhilesh Darjee
b9bca26671 [fix] [minor] time zone fix 2013-10-24 12:52:23 +05:30
Akhilesh Darjee
3d0af67799 [fix] [minor] add time zone and country to global defaults 2013-10-24 12:37:43 +05:30
Nabin Hait
d43c6bfdfb [fix] [merge conflict] 2013-10-24 11:57:02 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Nabin Hait
f62c386a34 Merge pull request #988 from MaxMorais/patch-1 
Fix UnicodeDecodeError
 2013-10-23 22:03:57 -07:00
Nabin Hait
828724b64a Merge pull request #973 from fogueri/master 
[docs] Customize links added
 2013-10-23 22:01:34 -07:00
Akhilesh Darjee
b558ff68b9 [fix] added country and time zone to global defaults 2013-10-23 20:09:08 +05:30
Nabin Hait
ad5b764a30 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-23 16:29:54 +05:30
Nabin Hait
88f3cd5bf3 [fix] [minor] gl entry negative debit/credit 2013-10-23 16:29:19 +05:30
Nabin Hait
c15c15f3d8 Merge pull request #992 from akhileshdarjee/master 
[fix] production order transfer raw material to fetch all necessary data
 2013-10-23 02:56:42 -07:00
Akhilesh Darjee
97e55710da [fix] [minor] get_items function fix 2013-10-23 15:22:22 +05:30
Akhilesh Darjee
2cdeb3bb7a [fix] [minor] if difference account blank then fetch from company 2013-10-23 14:46:07 +05:30
Akhilesh Darjee
1b01e0ffb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-23 14:06:39 +05:30
Akhilesh Darjee
d32b6a8d32 [fix] production order transfer raw material to fetch all necessary data 2013-10-23 14:03:46 +05:30
Nabin Hait
5048c98911 [utility] repost stock 2013-10-23 12:14:32 +05:30
Nabin Hait
c2caae53dd [utility] repost stock 2013-10-23 12:02:08 +05:30
Nabin Hait
4ed7f68344 [utility] repost stock 2013-10-23 11:50:09 +05:30
Nabin Hait
688c2ef588 [patch] delete gl entries for cancelled vouchers 2013-10-23 00:26:53 +05:30
Nabin Hait
decf51de4a [patch] delete gl entries for cancelled vouchers 2013-10-22 23:55:34 +05:30
Nabin Hait
145e5e26fa [patch] delete gl entries for cancelled vouchers 2013-10-22 23:51:41 +05:30
Nabin Hait
cf8ae7c3d9 [fix] [minor] perpetual inventory related 2013-10-22 12:57:19 +05:30
Nabin Hait
49f9e284ff [report] lead details 2013-10-22 12:11:20 +05:30
Nabin Hait
1500c83cce -am 2013-10-22 11:42:50 +05:30
Nabin Hait
72fcd55533 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-22 10:55:17 +05:30
Nabin Hait
6a589be1c5 [patch] remove sales and purchase return tool 2013-10-22 10:54:59 +05:30
Bárbara Perretti
8833c52c02 Fix translate public/js/startup.js 2013-10-21 17:39:37 -02:00
Maxwell
fb21c56078 Fix UnicodeDecodeError 
Traceback (most recent call last):
  File "./lib/wnf.py", line 590, in <module>
    run()
  File "./lib/wnf.py", line 314, in run
    build.bundle(False, cms_make)
  File "/home/maxwell/erp/lib/webnotes/build.py", line 27, in bundle
    on_build()
  File "app/startup/event_handlers.py", line 69, in on_build
  File "app/home/page/latest_updates/latest_updates.py", line 42, in make
  File "app/home/page/latest_updates/latest_updates.py", line 18, in add_to_logs
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 9: ordinal not in range(128)
 2013-10-21 17:29:18 -02:00
Nabin Hait
213da21332 [fix] [minor] naming for amendment 2013-10-21 18:32:56 +05:30
Priya
b0224d0ce0 [docs] item tax added 2013-10-21 17:07:46 +05:30
Nabin Hait
1abbebad7b [fix] [minor] naming series patch 2013-10-21 16:29:10 +05:30
Nabin Hait
aa0ea57d11 Merge pull request #986 from akhileshdarjee/master 
[fix] [minor] item wise price list rate report currency fix
 2013-10-21 03:49:44 -07:00
Akhilesh Darjee
41e4fb2bb8 [fix] [minor] item wise price list rate report currency fix 2013-10-21 16:14:02 +05:30
Rushabh Mehta
f3f496a8d7 [naming series] [minor] [fix] 2013-10-21 15:24:49 +05:30
Nabin Hait
953d0a955f [feature] Replace Company Abbr 2013-10-21 12:53:10 +05:30
Nabin Hait
c559ecf278 [fix] [minor] update values from report 2013-10-20 21:26:55 +05:30