Commit Graph

6824 Commits

Author SHA1 Message Date
Rushabh Mehta
4ad4b4378f Merge branch 'master' of github.com:webnotes/erpnext 2013-08-02 12:47:24 +05:30
Rushabh Mehta
79a0534fc0 [data import tool] [feature] Added ability to import / export documents with child records 2013-08-02 12:47:05 +05:30
Anand Doshi
e5c69133a8 [minor] moved delivered items to be billed to accounts module 2013-08-02 12:45:00 +05:30
Anand Doshi
33fe86777c [usability] Allow user to edit Price List if this option is checked in Selling Settings [issue] webnotes/erpnext#707 2013-08-02 12:39:10 +05:30
Nabin Hait
bbe1448fca Merge branch 'master' into perpetual 2013-08-02 11:53:00 +05:30
Nabin Hait
a1ad6e14ae Merge branch 'master' of github.com:webnotes/erpnext 2013-08-02 11:46:19 +05:30
Nabin Hait
0dd7be14fa [perpetual accounting] get stock balance on any date 2013-08-02 11:45:43 +05:30
Nabin Hait
8db287449f [cleanup] code commonified of making sl entry 2013-08-02 11:44:52 +05:30
Nabin Hait
cac622e097 [accounts] [perpetual] get account and stock balance difference 2013-08-02 11:44:29 +05:30
Nabin Hait
1e2f20a3da [cleanup] code commonified of making sl entry 2013-08-02 11:42:11 +05:30
Nabin Hait
b865db910b [accounts] [perpetual] accounts settings for perpetual accounting for inventory 2013-08-02 11:24:51 +05:30
Nabin Hait
dbe4d1930b [minor] added customer/supplier id and name in sales/purchase register 2013-08-02 11:20:02 +05:30
Anand Doshi
8762cdaf53 [fix] [minor] [issue] webnotes/erpnext#661 - remove script and style tags from communication content 2013-08-01 19:55:29 +05:30
Anand Doshi
7baa7fd129 [fix] [minor] [issue] webnotes/erpnext#658 - adjust expiry warning banner 2013-08-01 19:10:34 +05:30
Anand Doshi
5cd58dc387 [usability] [issue] webnotes/erpnext#606 - disable default currency after a transaction is created for a company 2013-08-01 18:58:35 +05:30
Anand Doshi
c4a54fe24e [usability] [issue] webnotes/erpnext#346 - hide packing list if it is empty 2013-08-01 18:19:51 +05:30
Anand Doshi
5edd570b49 [fix] [minor] features setup - hide company currency fields if export is disabled 2013-08-01 17:21:53 +05:30
Anand Doshi
078129f58f [fix] [minor] removed default from conversion_rate 2013-08-01 16:54:32 +05:30
Anand Doshi
17350b899f [fix] [mapper] from delivery note to sales invoice, only map unbilled items 2013-08-01 15:45:23 +05:30
Anand Doshi
49154c790e [fix] if no valid territory for price list, try adding the user's default territory 2013-08-01 15:43:33 +05:30
Anand Doshi
482f34302e [minor] purchase order - no_copy=0 for purchase other charges, so that the field could be mapped 2013-08-01 12:28:21 +05:30
Anand Doshi
97fd522788 [fix] material request - no_copy=0 for schedule_date so that it could be mapped to purchase order 2013-08-01 12:25:23 +05:30
Anand Doshi
ded00de58b Merge branch 'master' of github.com:webnotes/erpnext 2013-08-01 12:10:58 +05:30
Anand Doshi
74458a93bb [minor] [issue] webnotes/erpnext#405 - removed chat link for self-hosted instances 2013-08-01 12:10:09 +05:30
Nabin Hait
8608f0e9fa [fix] [minor] error display in voucher import tool 2013-07-31 18:00:25 +05:30
Nabin Hait
2d57e51112 [fix] [minor] null issue 2013-07-31 17:31:23 +05:30
Anand Doshi
0fa631944c [fix] [minor] [bug] int docstatus before to_docstatus check 2013-07-31 16:08:51 +05:30
Anand Doshi
f13da67341 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-31 11:48:42 +05:30
Anand Doshi
f006916518 [fix] [minor] [report] 2013-07-31 11:47:54 +05:30
Nabin Hait
f839846266 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-31 11:07:46 +05:30
Nabin Hait
69843a2e4e [fix] [minor] fixed validation in production order 2013-07-31 11:07:17 +05:30
Rushabh Mehta
cbf9cfe725 [fix] [minor] system manager role check 2013-07-31 09:52:28 +05:30
Rushabh Mehta
930113822b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-31 09:51:24 +05:30
Anand Doshi
5c76f014a7 [report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed 2013-07-30 18:42:16 +05:30
Rushabh Mehta
576a811084 [docs] 2013-07-30 17:22:04 +05:30
Rushabh Mehta
e3742322fb Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 16:20:19 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Anand Doshi
18b1e202d5 [fix] [issue] webnotes/erpnext#674 - hide Make Invoice button when invoicing of delivery/receipt is complete 2013-07-30 16:10:37 +05:30
Priya Shrivastava
ca7e07e47b [docs] 2013-07-30 15:40:02 +05:30
Priya Shrivastava
34064ac849 [docs] 2013-07-30 15:34:40 +05:30
Priya Shrivastava
955640a5af [docs] 2013-07-30 15:11:47 +05:30
Anand Doshi
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +05:30
Anand Doshi
733681a426 [fix] [minor] [sales invoice] trigger update stock on fetching pos details 2013-07-30 14:49:12 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Anand Doshi
7180eb6f20 [queries] [optimization] removed redundant code in get_match_cond 2013-07-30 14:40:44 +05:30
Nabin Hait
de72b44d28 [fix] [minor] pull only undelivered items in Dn from SO 2013-07-30 12:54:22 +05:30
Nabin Hait
9764e32d0a [fix] [minor] syntax error in stock entry 2013-07-30 12:38:19 +05:30
Nabin Hait
4525a0b900 [fix] [minor] null value issue 2013-07-30 11:19:20 +05:30
Anand Doshi
f314051e30 Merge branch 'master' of github.com:webnotes/erpnext into custom_script_defer 2013-07-30 10:44:07 +05:30
Anand Doshi
f90df7da02 [fix] [minor] if customer_account is mentioned in POS Settings, also fetch customer_name 2013-07-29 19:53:44 +05:30