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

954 Commits

Author SHA1 Message Date
Anand Doshi
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +05:30
Anand Doshi
79251492fe [fix] [minor] call set_dynamic_labels after onload_post_render 2013-08-09 00:20:34 +05:30
Anand Doshi
38a07cf86a [fix] [chart of accounts] view ledger should show correct account's ledger 2013-08-08 18:49:58 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Anand Doshi
1c77745d05 [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +05:30
Anand Doshi
5dd6b1d082 [optimization] [minor] pass filtered stock ledger entries to get_buying_amount 2013-08-07 19:27:30 +05:30
Anand Doshi
fbe1e167d4 [fix] [selling] reduce round-off loss when using tax inclusive price 2013-08-06 19:38:19 +05:30
Nabin Hait
d9f4d174d1 [minor] [fix] 2013-08-06 15:28:55 +05:30
Nabin Hait
0d462745d2 Update sales_invoice.js 2013-08-06 15:26:52 +05:30
Rushabh Mehta
d056e1b453 [minor] added webnotes.get_list, fixed webnotes/erpnext#663 2013-08-05 16:21:04 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Nabin Hait
7e405e26b6 [fix] [minor] expense head get_query fixed in purchase invoice 2013-08-05 13:00:20 +05:30
Nabin Hait
4b7a79c2b3 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-05 12:44:30 +05:30
Nabin Hait
7895d34d41 [fix] [minor] SO/DN required validation and get_single_value deprecated 2013-08-05 12:44:10 +05:30
Rushabh Mehta
c12553fba1 [journal voucher] [minor] added Reference section break in Journal Voucher Detail 2013-08-02 18:20:10 +05:30
Nabin Hait
0b6e590766 [fix] [minor] get supplier details in purchase invoice 2013-08-02 16:08:04 +05:30
Anand Doshi
6affb78e1f [minor] moved delivered items to be billed to accounts module 2013-08-02 12:50:40 +05:30
Anand Doshi
e5c69133a8 [minor] moved delivered items to be billed to accounts module 2013-08-02 12:45:00 +05:30
Nabin Hait
a1ad6e14ae Merge branch 'master' of github.com:webnotes/erpnext 2013-08-02 11:46:19 +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
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
Nabin Hait
8608f0e9fa [fix] [minor] error display in voucher import tool 2013-07-31 18:00:25 +05:30
Anand Doshi
0fa631944c [fix] [minor] [bug] int docstatus before to_docstatus check 2013-07-31 16:08:51 +05:30
Anand Doshi
f006916518 [fix] [minor] [report] 2013-07-31 11:47:54 +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
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
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
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
19d945a4e7 [minor] [fix] apply float precision on over-billing validation 2013-07-29 18:35:39 +05:30
Rushabh Mehta
17082e71f1 [pos] [minor] removed import of pos.js 2013-07-29 15:37:07 +05:30
Rushabh Mehta
895f61da84 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-29 15:31:42 +05:30
Rushabh Mehta
4a008f5567 [sales_invoice] [pos] [minor] Added view for POS 2013-07-29 15:31:11 +05:30
Nabin Hait
5e200e43a6 [minor] duplicate row id from same prevdoc 2013-07-29 15:29:51 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +05:30
Anand Doshi
10c773dc1c [fix] [minor] [sales invoice] don't hide warehouse and delivered_qty 2013-07-29 12:27:47 +05:30
Nabin Hait
173e874610 [fix] maintain same rate throughout purchase cycle optional 2013-07-29 11:24:11 +05:30
Nabin Hait
114bc09164 [minor] [fix] same account in item and tax table 2013-07-26 15:47:47 +05:30