Nabin Hait
|
272410bb87
|
[fix] [minor] fixes in payment reconciiation
|
2013-09-05 15:43:05 +05:30 |
|
Nabin Hait
|
335cdeaf7d
|
[fix] [minor] fixes in test cases for is_pos
|
2013-09-05 14:00:57 +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
|
8543469fba
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-05 12:22:14 +05:30 |
|
Nabin Hait
|
2162fee396
|
Merge pull request #792 from akhileshdarjee/master
[pos][fix] fixed pos view in sales_invoice.js
|
2013-09-04 22:03:42 -07:00 |
|
Akhilesh Darjee
|
734b2aab5c
|
[fix] pos setting link fields validate to specific company
|
2013-09-04 18:48:08 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Anand Doshi
|
1dadf35fc7
|
[fix] [minor] [query] sales invoice from delivery note
|
2013-09-03 16:21:01 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Akhilesh Darjee
|
45af0a18b6
|
[pos] [minor] pos setting fix
|
2013-09-02 19:05:55 +05:30 |
|
Akhilesh Darjee
|
7a274e4d2f
|
[pos] [minor] pos print format & pos setting cancel function allowed
|
2013-09-02 18:53:09 +05:30 |
|
Akhilesh Darjee
|
12425ce85e
|
[pos] [minor] pos completed
|
2013-09-02 18:48:39 +05:30 |
|
Anand Doshi
|
ddb7c8048e
|
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
|
2013-09-02 11:13:32 +05:30 |
|
Nabin Hait
|
0ddcc6f7cf
|
[fix] [minor] set invoice due date based on credit days
|
2013-08-31 10:19:56 +05:30 |
|
Anand Doshi
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|
Nabin Hait
|
da1e503f3d
|
[fix] [minor] removed sample item field from item
|
2013-08-30 16:24:44 +05:30 |
|
Akhilesh Darjee
|
cf0b6d579f
|
[pos] POS Invoice print format done
|
2013-08-29 19:21:03 +05:30 |
|
Akhilesh Darjee
|
d2714310ed
|
[pos][minor] barcode clear timeout done
|
2013-08-28 19:35:22 +05:30 |
|
Akhilesh Darjee
|
f3eae2344b
|
[pos][minor] fixed sales_invoice.js for pos view
|
2013-08-28 11:50:01 +05:30 |
|
Anand Doshi
|
c753d31ba7
|
[fix] [minor] erpnext demo
|
2013-08-26 17:33:50 +05:30 |
|
Anand Doshi
|
6c0a1a9674
|
[fix] [minor] temporarily disabled pos view
|
2013-08-23 19:30:44 +05:30 |
|
Akhilesh Darjee
|
1f0b8606d6
|
[pos][minor]
|
2013-08-23 18:22:32 +05:30 |
|
Rushabh Mehta
|
cb50dee98c
|
[pos] [minor] added css file
|
2013-08-23 13:35:21 +05:30 |
|
Rushabh Mehta
|
16a62fa4be
|
[pos] [cleanup]
|
2013-08-23 13:16:22 +05:30 |
|
Akhilesh Darjee
|
d6aa4bff7f
|
[pos] pos view first commit
|
2013-08-22 17:26:43 +05:30 |
|
Rushabh Mehta
|
622c98d6f4
|
[demo] [minor] Added accounts, moved JV creation to server-side
|
2013-08-22 15:17:58 +05:30 |
|
Nabin Hait
|
77343391f5
|
[fix] [minor] changed validation message
|
2013-08-22 10:45:41 +05:30 |
|
Nabin Hait
|
76273ebfbc
|
[merge] [minor] Fixed conflict while merging serial_no branch with master
|
2013-08-19 16:26:13 +05:30 |
|
Nabin Hait
|
3ccd07cc72
|
[fix] [minor] paid amount should be zero if not pos invoice
|
2013-08-16 15:21:25 +05:30 |
|
Nabin Hait
|
21cf403b57
|
[fix] [minor] paid amount should be zero if not pos invoice
|
2013-08-16 15:15:16 +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 |
|
Anand Doshi
|
30324b857a
|
[fix] [minor] set due date in sales invoice after mapping
|
2013-08-14 17:07:42 +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 |
|
Anand Doshi
|
47e14a9de4
|
[fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings
|
2013-08-13 13:01:12 +05:30 |
|
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 |
|
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 |
|