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

7387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Priya
b0224d0ce0 [docs] item tax added 2013-10-21 17:07:46 +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
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
Nabin Hait
009a2d0f7e Merge pull request #977 from akhileshdarjee/master 
[fix] [minor] item price added in setup page and stock
 2013-10-18 04:06:39 -07:00
Akhilesh Darjee
f295692937 [fix] [minor] item price added in setup page and stock 2013-10-18 16:21:32 +05:30
Nabin Hait
6b6e0c004f Merge pull request #975 from akhileshdarjee/master 
[item price] item price made as an individual master and removed from price list
 2013-10-18 03:14:34 -07:00
Akhilesh Darjee
cd80d86dbb [fix] [minor] renamed edit prices button from price list and item 2013-10-18 15:35:13 +05:30
Akhilesh Darjee
2d82f26976 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-18 15:28:15 +05:30
Akhilesh Darjee
4ceef34c74 [report] created new item-wise price list rate report 2013-10-18 15:24:53 +05:30
Akhilesh Darjee
fcd70d04f3 [item price] item price made as an individual master and removed from price list 2013-10-18 14:24:21 +05:30
Nabin Hait
8f72d9f679 Merge pull request #974 from akhileshdarjee/master 
[fix] [minor] conversion rate related fixes
 2013-10-17 00:56:00 -07:00
Akhilesh Darjee
04638a5f77 [fix] [minor] onload post render also check for supplier 2013-10-17 13:19:46 +05:30
Akhilesh Darjee
acf65a7225 [fix] [minor] conversion rate related fixes 2013-10-17 13:04:26 +05:30
Priya
006623a7fc [docs] minor customer portal 2013-10-17 12:59:20 +05:30
Priya
f913e0f29a [docs] customer portal added 2013-10-17 12:46:41 +05:30
Priya
2dd558e500 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-17 12:45:39 +05:30
Priya
93d2c7aebb [docs] Customize links added 2013-10-17 11:44:31 +05:30
Rushabh Mehta
be7e8556b0 Merge pull request #972 from akhileshdarjee/master 
[fix] [minor] conversion rater
 2013-10-16 23:03:41 -07:00
Akhilesh Darjee
3add576b1e [fix] [minor] conversion rate fix 2013-10-17 11:32:44 +05:30
Akhilesh Darjee
564c621c3e [fix] [minor] conversion rate fix 2013-10-17 11:31:11 +05:30
Anand Doshi
940e893834 Merge pull request #971 from MaxMorais/patch-1 
Fix UnicodeDecodeError
 2013-10-16 21:48:54 -07:00
Maxwell
ccbde214c2 Fix UnicodeDecodeError 
```python
Traceback (most recent call last):
  File "install_erpnext.py", line 348, in <module>
    install()
  File "install_erpnext.py", line 13, in install
    install_pre_requisites()
  File "install_erpnext.py", line 25, in install_pre_requisites
    install_using_yum()
  File "install_erpnext.py", line 90, in install_using_yum
    update_config_for_redhat()
  File "install_erpnext.py", line 106, in update_config_for_redhat
    exec_in_shell("chkconfig --level 2345 %s on" % service)
  File "install_erpnext.py", line 339, in exec_in_shell
    if err and any((kw in err.lower() for kw in ["traceback", "error", "exception"])):
  File "install_erpnext.py", line 339, in <genexpr>
    if err and any((kw in err.lower() for kw in ["traceback", "error", "exception"])):
```
 2013-10-16 16:52:01 -03:00
Nabin Hait
185991d547 [fix] [minor] rounding error in purchase invoice gl entry 2013-10-16 13:08:53 +05:30
Nabin Hait
a012ffedd1 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-16 11:48:39 +05:30
Nabin Hait
fc75d96abd [fix] [minor] Purchase Invoice - Amount for Stock received but not billed 2013-10-16 11:48:15 +05:30
Nabin Hait
c9f7c36206 Merge pull request #969 from akhileshdarjee/master 
[fix] fixed conversion rate for mapping any documents
 2013-10-15 22:04:22 -07:00
Akhilesh Darjee
61b5c59e70 [fix] fixed conversion rate for mapping any documents 2013-10-15 20:24:34 +05:30
Nabin Hait
b6f37b8195 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:55:54 +05:30
Nabin Hait
b338b6ed24 [fix] [minor] validate converion rate 2013-10-15 16:55:24 +05:30
Nabin Hait
a466df8735 Merge pull request #968 from akhileshdarjee/master 
[fix] fetch difference account and cost center on selecting item in stock entry
 2013-10-15 04:03:15 -07:00
Akhilesh Darjee
8f90e1c8f4 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:26:38 +05:30
Akhilesh Darjee
dd6ebc1a4d [cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting 2013-10-15 15:54:31 +05:30