Commit Graph

603 Commits

Author SHA1 Message Date
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
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +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
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +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
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
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
0fa631944c [fix] [minor] [bug] int docstatus before to_docstatus check 2013-07-31 16:08:51 +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
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Anand Doshi
52b049145b [fix] [minor] call refresh_fields after cur_frm.call when doc is passed 2013-07-25 19:13:45 +05:30
Anand Doshi
742b55f700 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:53:50 +05:30
Anand Doshi
60403b2d8f [fix] [minor] [grid] set_colum_disp should force refresh the whole grid 2013-07-25 18:53:22 +05:30
Rushabh Mehta
c97fe01837 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:14:18 +05:30
Nabin Hait
ea51b41239 [fix] [minor] allowed territory group in all transactions 2013-07-25 18:01:13 +05:30
Rushabh Mehta
152cecc9cd Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 17:47:38 +05:30
Anand Doshi
f2045fb92e [fix] [minor] set customer/supplier defaults 2013-07-25 17:46:02 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Nabin Hait
bfe0c47805 [fix] [minor] budget distribution validation 2013-07-25 17:23:00 +05:30
Nabin Hait
d2b3fe8a02 [fix] [minor] get_query for cost center form 2013-07-25 16:29:15 +05:30
Rushabh Mehta
60117d6d62 [minor] moved Debit To and Credit To in Sales / Purchase Invoice to More Info #645 2013-07-25 16:09:50 +05:30
Nabin Hait
4166c35277 [fix] [minor] over billing validation against delivery note 2013-07-25 15:14:59 +05:30
Rushabh Mehta
a877053d90 [accounts] [minor] [fix] fixed set_query for Mode of Payment 2013-07-25 10:49:59 +05:30
Rushabh Mehta
148cbaeafe [minor] fixed help for Sales Invoice / Purchase Invoice 2013-07-24 21:44:59 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30