Commit Graph

705 Commits

Author SHA1 Message Date
Nabin Hait
7a75e10a61 [fix] [minor] perpetual inventory: account for each warehouse 2013-09-17 10:21:20 +05:30
Akhilesh Darjee
c96c13af4e [fix] make demo for price list 2013-09-12 19:19:46 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
1be5bb7e6a [portal] [minor] show status for order and invoice 2013-09-12 15:25:47 +05:30
Anand Doshi
fb109aded0 [website] [minor] moving to framework 2013-09-11 18:58:20 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
b0d996ffb1 [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
Anand Doshi
429fd1d3d8 Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip 2013-09-10 12:54:10 +05:30
Rushabh Mehta
7c2312a74c [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Anand Doshi
1b2d84db0d [fix] [minor] print hide communication table 2013-09-10 10:46:56 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Nabin Hait
ce4be997ab Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 17:38:52 +05:30
Nabin Hait
63b5ef7ecf [fix] [minor] is_pos zero when mapping 2013-09-05 17:38:24 +05:30
Anand Doshi
d983aca567 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 13:31:46 +05:30
Anand Doshi
c28f84298f [fix] [minor] opportunity to quotation - load price list values 2013-09-05 13:31:20 +05:30
Akhilesh Darjee
a7b7d2559e [fix] merge conflict 2013-09-05 13:18:22 +05:30
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Anand Doshi
512113ae51 Merge branch 'customer-login' 2013-09-05 12:21:29 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Anand Doshi
7b044da0e3 [fix] [minor] on_communication, when checking if system user, extract email id and then check 2013-09-04 18:14:20 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
53ecddd612 [fix] [communication] on communication send, update status 2013-09-04 17:52:27 +05:30
Anand Doshi
d01f0cb46e [fix] [communication] on communication send, update status 2013-09-04 17:38:29 +05:30
Rushabh Mehta
090d410498 [minor] communication, webnotes/erpnext#790 2013-09-04 16:20:18 +05:30
Anand Doshi
d5c18d46d0 [minor] [customer login] renamed order template to sale and use it for order, invoice and delivery note 2013-09-04 15:07:00 +05:30
Anand Doshi
0e23929740 Merge branch 'master' into customer-login 2013-09-03 16:42:21 +05:30
Anand Doshi
4263344cd2 [fix] [minor] customer-wise discount 2013-09-03 16:21:21 +05:30
Anand Doshi
3139973662 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:41:31 +05:30
Anand Doshi
627c42bdb6 [fix] [minor] quotation to sales order, if not able to create customer, show message 2013-09-03 15:34:24 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Nabin Hait
20a6f93612 Merge branch 'master' into perpetual 2013-09-03 11:26:02 +05:30
Rushabh Mehta
98429afe91 [communication] [minor] 2013-09-02 18:52:27 +05:30
Rushabh Mehta
0f2b684a45 [communication] [minor] 2013-09-02 18:47:34 +05:30
Rushabh Mehta
57e47cd93d [communication] [minor] 2013-09-02 18:45:11 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30
Rushabh Mehta
a2d0da8840 [communication] [minor] 2013-09-02 18:27:29 +05:30
Rushabh Mehta
8f04d119bb [communication] [minor 2013-09-02 17:39:59 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Nabin Hait
da3110fc12 [merge] [minor] merged with master 2013-09-02 13:07:49 +05:30
Anand Doshi
f7e5648365 [minor] customer login start 2013-08-29 17:46:40 +05:30
Anand Doshi
4b29c89692 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-29 13:59:23 +05:30
Anand Doshi
1c8ec406ae [fix] [minor] lead validate 2013-08-29 13:58:47 +05:30
Rushabh Mehta
46ec268e9b [communications] [minor] Code cleanup so it can be extended by custom script 2013-08-29 13:53:36 +05:30
Anand Doshi
252d14a85e [fix] [minor] validate warehouse user for sales order 2013-08-27 11:52:17 +05:30
Nabin Hait
d608042de4 [fix] [minor] batch no get query 2013-08-27 10:51:41 +05:30
Nabin Hait
23b3610fe8 [fix] [minor] batch no get query 2013-08-27 10:43:08 +05:30
Rushabh Mehta
a65253b5d5 [stock] [minor] Added Warehouse User check in Sales Order 2013-08-27 10:32:56 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Anand Doshi
53cd86b0d8 [fix] [minor] added item_name field in sales bom item query 2013-08-23 16:38:25 +05:30
Nabin Hait
d5b01a1ddc [fix] [minor] removed reserved warehouse from no_copy in sales order item 2013-08-22 15:43:18 +05:30
Nabin Hait
4c60041707 [fix] [minor] removed reserved warehouse from no_copy in sales order item 2013-08-22 15:22:53 +05:30
Nabin Hait
11bd44e447 [minor] fixed conflict while merging with master 2013-08-21 17:51:46 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
4ae729bfd2 [cleanup] [minor] deprecated cancelled stock ledger entry 2013-08-20 12:04:46 +05:30
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Rushabh Mehta
3423a73009 [serial no] Allow creation only of Warehouse is not set, [translation] Italian 2013-08-16 13:03:34 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +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
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Rushabh Mehta
43d7de8cdc Merge branch 'master' of github.com:webnotes/erpnext 2013-08-08 07:41:25 +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
Rushabh Mehta
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Rushabh Mehta
0cb97f3627 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 15:08:37 +05:30
Rushabh Mehta
7c2a2e24a2 [demo] [minor] simulate quotation 2013-08-07 15:08:11 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Nabin Hait
1107f20dd6 [fix] [minor] bug fixed _ imported 2013-08-07 14:33:32 +05:30
Nabin Hait
8daa702a90 Merge branch 'master' into perpetual 2013-08-07 12:46:50 +05:30
Nabin Hait
74506ba060 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 12:36:13 +05:30
Nabin Hait
c478349379 [fix] [minot] reserved warehouse mandatory validation for packing items 2013-08-07 12:35:45 +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
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Rushabh Mehta
5eedde191f [mapper] [minor] idx fix for multiple pulls webnotes/erpnext#651 2013-08-06 12:40:23 +05:30
Anand Doshi
b9eb0849c3 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-06 11:55:15 +05:30
Anand Doshi
d505940b18 [fix] [minor] [query] get sales bom item code 2013-08-06 11:54:26 +05:30
Nabin Hait
ae6720be02 Update sales_order.py 2013-08-06 11:22:14 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
5013dcb12c [fix] [minor] change_grid_labels 2013-08-05 12:16:04 +05:30
Anand Doshi
edfba96ce1 [fix] [minor] show company currency fields if included_in_print_rate is checked 2013-08-05 11:56:54 +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
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
Anand Doshi
c4a54fe24e [usability] [issue] webnotes/erpnext#346 - hide packing list if it is empty 2013-08-01 18:19:51 +05:30
Nabin Hait
2d57e51112 [fix] [minor] null issue 2013-07-31 17:31:23 +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
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +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
de72b44d28 [fix] [minor] pull only undelivered items in Dn from SO 2013-07-30 12:54:22 +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
Anand Doshi
25647c4375 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2013-07-29 13:31:00 +05:30
Anand Doshi
d5d39ac5ec [fix] [minor] sales and purchase get_queries 2013-07-29 13:28:37 +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
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +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
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
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Nabin Hait
23a64d7f9d [minor] removed customer validation between quotation and SO 2013-07-24 16:19:54 +05:30
Anand Doshi
ba8ea7dbfd [minor] [fix] fetch contact details 2013-07-24 12:08:42 +05:30
Nabin Hait
deff57826a [minor] [fix] fetch contact details 2013-07-24 11:30:35 +05:30
Nabin Hait
64a9d0ccef Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 15:31:57 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
ed69892a0a [minor] [query] sales person 2013-07-23 15:16:50 +05:30
Anand Doshi
1dc95ed865 [minor] [selling] [fix] fetch available qty for given warehouse 2013-07-23 13:36:38 +05:30
Anand Doshi
2fdd874cae Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 11:02:22 +05:30
Anand Doshi
f577b09b3b [minor] [fix] sales and purchase analytics 2013-07-23 11:01:27 +05:30
Nabin Hait
5fa994f7a1 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 17:15:16 +05:30
Nabin Hait
d351318014 [minor] [fix] employee field while new sales person created from tree 2013-07-22 17:15:01 +05:30
Anand Doshi
7dd5034b03 [minor] [fix] [issue] #624 2013-07-22 16:36:11 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Nabin Hait
50f5fd13c7 [feature] [selling] customer discount item_group wise 2013-07-22 13:10:13 +05:30
Anand Doshi
95391b176a [minor] [fix] [issue] #618 2013-07-19 16:48:00 +05:30
Anand Doshi
648fd16e98 [minor] [fix] #616 2013-07-19 14:15:58 +05:30
Anand Doshi
573b423a6c Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 13:26:53 +05:30
Anand Doshi
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Nabin Hait
55b5dd2f10 [fix] [mapper] 2013-07-18 13:05:14 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Anand Doshi
80166e26cc [minor] [selling/buying] use script_manager.trigger instead of calling cscript function directly post item details fetch, so that custom code can be executed 2013-07-17 14:49:13 +05:30
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30
Nabin Hait
40cb8fb193 [fix] [minor] Installation Note: pulling from DN and code cleanup 2013-07-15 17:23:49 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Anand Doshi
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Anand Doshi
63d844b2d2 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py
2013-07-10 20:55:15 +05:30
Anand Doshi
2ac0a83bd8 [webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order 2013-07-10 20:49:44 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30