Anand Doshi
|
91e4c14470
|
[fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal
|
2013-05-01 12:00:44 +05:30 |
|
Nabin Hait
|
76646fb279
|
[script report] bank reconciliation statement in new style
|
2013-05-01 11:23:44 +05:30 |
|
Nabin Hait
|
84e2af2212
|
[report] add total row
|
2013-04-30 18:08:43 +05:30 |
|
Nabin Hait
|
98cfe688a8
|
[script report] purchase register in new style
|
2013-04-30 17:22:43 +05:30 |
|
Anand Doshi
|
457cd7d1f4
|
[gl entry] [validation] company match validation should be done only for is_cancelled = No
|
2013-04-29 13:01:44 +05:30 |
|
Nabin Hait
|
99883420e7
|
[general ledger][fixes] for against_account value
|
2013-04-29 12:17:05 +05:30 |
|
Anand Doshi
|
c9897ff533
|
Merge branch 'edge'
Conflicts:
home/page/latest_updates/latest_updates.js
|
2013-04-29 10:42:21 +05:30 |
|
Anand Doshi
|
edc5f2edd0
|
[sales invoice] [fetching] fetch pos values and customer address contact values
|
2013-04-26 17:21:49 +05:30 |
|
Rushabh Mehta
|
e0ec7b0330
|
Merge branch 'master' into responsive
|
2013-04-26 15:41:20 +05:30 |
|
Nabin Hait
|
205f7ce620
|
validation for stock and nonstock items in purchase cycle
|
2013-04-26 13:35:06 +05:30 |
|
Nabin Hait
|
5c2cb74e7a
|
[script report] sales register migrated into new script report
|
2013-04-24 15:46:09 +05:30 |
|
Anand Doshi
|
d54a4741a9
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 12:02:54 +05:30 |
|
Anand Doshi
|
a5d19955d1
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 11:48:28 +05:30 |
|
Rushabh Mehta
|
f1cfbeaa5c
|
[merge] fix
|
2013-04-24 10:03:56 +05:30 |
|
Anand Doshi
|
a63b9e7762
|
Merge branch 'master' into edge
|
2013-04-23 16:29:33 +05:30 |
|
Nabin Hait
|
b2972dca98
|
[script report] accounts payable migrated to new style
|
2013-04-23 15:53:33 +05:30 |
|
Nabin Hait
|
ebd514442a
|
[script report] accounts payable migrated to new style
|
2013-04-23 15:36:26 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Anand Doshi
|
6b66811aec
|
Merge branch 'master' into edge
|
2013-04-22 13:59:59 +05:30 |
|
Nabin Hait
|
79269e9382
|
fixed conflict
|
2013-04-22 13:17:24 +05:30 |
|
Nabin Hait
|
e7366f763b
|
[report] accounts receivable migrated into new style
|
2013-04-22 13:14:52 +05:30 |
|
Anand Doshi
|
faab3c4cf2
|
[listview] [label] show appropriate tooltip for bar graph
|
2013-04-22 12:20:09 +05:30 |
|
Rushabh Mehta
|
01f6fc1206
|
Merge branch 'master' into responsive
|
2013-04-22 12:14:41 +05:30 |
|
Nabin Hait
|
f19822b041
|
fixes in sales/purchase invoice list view
|
2013-04-22 12:01:01 +05:30 |
|
Anand Doshi
|
aeef7bd910
|
[sales taxes and charges] renamed field cost_center_other_charges to cost_center
|
2013-04-19 16:21:55 +05:30 |
|
Rushabh Mehta
|
cc32b65b66
|
[toolbars] [design] commonified into common toolbar
|
2013-04-19 13:01:32 +05:30 |
|
Anand Doshi
|
90dad5c5b5
|
Merge branch 'master' into edge
|
2013-04-19 11:43:16 +05:30 |
|
Nabin Hait
|
bbd8dddd56
|
allowed rename for mode of payment
|
2013-04-19 11:01:03 +05:30 |
|
Rushabh Mehta
|
d6c8235fb5
|
[style] [upgrade] moved to bootstrap 3
|
2013-04-18 17:43:21 +05:30 |
|
Anand Doshi
|
8f92607dc4
|
[gl entry] [validation] validate if cost center belongs to given company
|
2013-04-18 16:21:01 +05:30 |
|
Rushabh Mehta
|
651ce05fcc
|
[merge master
]
|
2013-04-18 10:37:16 +05:30 |
|
Anand Doshi
|
5717fe3aba
|
[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation
|
2013-04-17 18:02:52 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Rushabh Mehta
|
ac118c8822
|
[cleanup] started responsive layouts and removed tinymce
|
2013-04-15 17:02:20 +05:30 |
|
Anand Doshi
|
b094ae7f23
|
[general ledger] [fix] renamed function
|
2013-04-12 20:19:10 +05:30 |
|
Anand Doshi
|
36ecbbd9e8
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-04-12 15:41:31 +05:30 |
|
Nabin Hait
|
d246de8417
|
[fixes][account][packing slip]
|
2013-04-11 15:31:41 +05:30 |
|
Anand Doshi
|
93b638af4d
|
Merge branch 'master' into edge
Conflicts:
patches/patch_list.py
|
2013-04-10 19:47:46 +05:30 |
|
Nabin Hait
|
54cab9cded
|
[fixes] fixes in general ledger grid report
|
2013-04-10 16:04:18 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Nabin Hait
|
a477d41843
|
[aii] some fixes
|
2013-04-08 12:39:11 +05:30 |
|
Nabin Hait
|
93b4e4d90c
|
[JV] added letter head field in jv
|
2013-04-05 11:11:14 +05:30 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Anand Doshi
|
0b9ec8cbc1
|
[auto inventory accounting] [fix] if non stock item, dont create gl entry in delivery note and pos sales invoice
|
2013-04-03 13:45:28 +05:30 |
|
Rushabh Mehta
|
5c12765313
|
[merge]
|
2013-04-02 10:51:11 +05:30 |
|
Nabin Hait
|
eaeb50effa
|
[fixes] small issue fixed in sales taxes and charges
|
2013-04-01 15:40:50 +05:30 |
|
Nabin Hait
|
1013e77957
|
fixes in checking print_hide property in standard print format
|
2013-04-01 12:18:36 +05:30 |
|
Nabin Hait
|
dc35137e20
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-30 17:47:56 +05:30 |
|
Anand Doshi
|
19acce9fa1
|
[aii] [patches] minor fixes
|
2013-03-29 20:40:23 +05:30 |
|
Anand Doshi
|
82433e81c6
|
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
|
2013-03-29 16:47:56 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Anand Doshi
|
10a209d405
|
[gross profit] [request] added Avg. Buying Rate column
|
2013-03-29 12:26:47 +05:30 |
|
Nabin Hait
|
acecb94a0f
|
patch: update item tax rate in json format
|
2013-03-29 10:48:41 +05:30 |
|
Anand Doshi
|
8c45420f19
|
fixes in gross profit report
|
2013-03-28 16:40:30 +05:30 |
|
Nabin Hait
|
41fe3567bb
|
fixed conflict and aii check in global defaults
|
2013-03-28 15:54:11 +05:30 |
|
Anand Doshi
|
c09831f8f2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 18:47:01 +05:30 |
|
Anand Doshi
|
96b189c118
|
fixes in test cases and buying amount function
|
2013-03-26 18:43:10 +05:30 |
|
Nabin Hait
|
d1d7de2b43
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 17:44:17 +05:30 |
|
Nabin Hait
|
88eb328622
|
fixes: show deducted tax in purchase register
|
2013-03-26 17:44:00 +05:30 |
|
Rushabh Mehta
|
f9d2ff067e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 17:16:15 +05:30 |
|
Rushabh Mehta
|
e9ef6be57f
|
[rename] [feature] added merge feature to rename_doc
|
2013-03-26 17:15:49 +05:30 |
|
Nabin Hait
|
808b085057
|
fixes: make payment entry from purchase invoice
|
2013-03-26 17:07:11 +05:30 |
|
Nabin Hait
|
19da7b8bdf
|
fixes: fetching from pos setting
|
2013-03-26 15:47:46 +05:30 |
|
Nabin Hait
|
7483485ac0
|
fixes: fetching from pos setting
|
2013-03-26 15:43:18 +05:30 |
|
Nabin Hait
|
495db08104
|
copy expense account to all row if entered in one
|
2013-03-26 15:24:56 +05:30 |
|
Nabin Hait
|
e28efd8dc8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 15:03:49 +05:30 |
|
Nabin Hait
|
b3b335c89e
|
fixes: make payment entry from sales invoice
|
2013-03-26 15:03:13 +05:30 |
|
Anand Doshi
|
ea4b05bb2c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 14:49:48 +05:30 |
|
Anand Doshi
|
40dc9e83a5
|
fixes in test cases and added fiscal year field to stock reco
|
2013-03-26 14:49:25 +05:30 |
|
Rushabh Mehta
|
08c33bd6bc
|
[accounts] [fix] aganist_jv query error
|
2013-03-26 14:43:41 +05:30 |
|
Rushabh Mehta
|
f5784e785a
|
[accounts] [fix] aganist_jv query error
|
2013-03-26 14:41:09 +05:30 |
|
Nabin Hait
|
e1c76a1a8e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 13:01:28 +05:30 |
|
Nabin Hait
|
4a4ae0840a
|
expense account optional mandatory in pos setting
|
2013-03-26 13:00:53 +05:30 |
|
Nabin Hait
|
fd606afcb9
|
expense account optional mandatory in pos sett
|
2013-03-26 12:50:03 +05:30 |
|
Anand Doshi
|
fc33ef6bfb
|
fixes in purchase invoice
|
2013-03-26 12:13:14 +05:30 |
|
Nabin Hait
|
72d9c5b724
|
fixed floating point issue in jv
|
2013-03-26 11:54:40 +05:30 |
|
Nabin Hait
|
82be7dc301
|
fixed conflict
|
2013-03-25 18:30:15 +05:30 |
|
Nabin Hait
|
557d858d89
|
aii: patches and default values fetching
|
2013-03-25 18:28:16 +05:30 |
|
Rushabh Mehta
|
74506e96d3
|
[profile/email] [feature] added option not to send print as email body. fix in profile delete
|
2013-03-25 17:52:14 +05:30 |
|
Rushabh Mehta
|
06d186ba98
|
[stock] [feature] added project to stock ledger entry and updated stock balance report
|
2013-03-25 17:03:52 +05:30 |
|
Rushabh Mehta
|
e97ce3475d
|
[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher
|
2013-03-25 15:55:24 +05:30 |
|
Rushabh Mehta
|
2f8ad5e5c1
|
[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher
|
2013-03-25 15:48:57 +05:30 |
|
Rushabh Mehta
|
df8b652402
|
[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher
|
2013-03-25 15:44:36 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +05:30 |
|
Nabin Hait
|
690fefe9c1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 11:07:38 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Anand Doshi
|
aeed499d12
|
Merge branch 'master' into edge
Conflicts:
setup/doctype/backup_manager/backup_dropbox.py
|
2013-03-22 18:43:47 +05:30 |
|
Anand Doshi
|
b632ba5f51
|
changed fieldtype of repeat_on_day_of_month to Int
|
2013-03-22 18:38:33 +05:30 |
|
Akhilesh Darjee
|
2f2ac966ad
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-22 18:28:51 +05:30 |
|
Akhilesh Darjee
|
ac61ec3a5b
|
Permissions problem in invoice fixed.
|
2013-03-22 18:20:11 +05:30 |
|
Anand Doshi
|
c8e64f5d42
|
shifted field category of Purchase Taxes and Charges to the left
|
2013-03-22 16:49:16 +05:30 |
|
Anand Doshi
|
ceba917e86
|
Merge branch 'master' into edge
|
2013-03-22 14:16:53 +05:30 |
|
Anand Doshi
|
a47ac1bed0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-22 13:32:11 +05:30 |
|
Anand Doshi
|
a3b9b1a868
|
added filters from date and to date
|
2013-03-22 13:16:10 +05:30 |
|
Rushabh Mehta
|
da512ba8c9
|
website: made order and ticket listing
|
2013-03-22 12:45:44 +05:30 |
|
Nabin Hait
|
54e79995ee
|
fixes in trend analyzer
|
2013-03-22 12:35:11 +05:30 |
|
Anand Doshi
|
8c5844e3fb
|
show sales invoice data in gross profit report
|
2013-03-21 20:24:10 +05:30 |
|
Anand Doshi
|
6d8d3b4cee
|
fixes in gross profit report
|
2013-03-21 18:45:02 +05:30 |
|
Nabin Hait
|
a0e7c1539b
|
aii: book expense in delivery note instead of sales invoice
|
2013-03-21 18:37:06 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
Akhilesh Darjee
|
34c13ac52c
|
added description to sales_invoice.txt
|
2013-03-21 13:22:32 +05:30 |
|
Akhilesh Darjee
|
fadffcf528
|
description added to 'Is Opening' and 'Aging Date' field
|
2013-03-21 13:06:41 +05:30 |
|
Anand Doshi
|
407331675f
|
recurring invoice test cases, set period start date and period end date as first and last day of the month if previously so, else just add months
|
2013-03-20 21:14:03 +05:30 |
|
Anand Doshi
|
7da72dd449
|
unlink against voucher in jv when Purchase Invoice, Sales Invoice or Journal Voucher are cancelled
|
2013-03-20 17:00:41 +05:30 |
|
Nabin Hait
|
364f08a171
|
fixed conflict
|
2013-03-19 18:29:05 +05:30 |
|
Nabin Hait
|
80abad2ee0
|
aii: default account from company
|
2013-03-19 18:18:52 +05:30 |
|
Anand Doshi
|
9a20cc5cd8
|
Merge branch 'sales_purchase_return'
|
2013-03-19 16:23:11 +05:30 |
|
Nabin Hait
|
fbafced1e4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-19 13:53:55 +05:30 |
|
Anand Doshi
|
688b52e14b
|
increase width of taxes table in print format
|
2013-03-19 13:35:40 +05:30 |
|
Nabin Hait
|
928355ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-19 12:02:13 +05:30 |
|
Nabin Hait
|
89a94d8135
|
aii: stock reconciliation with test case
|
2013-03-19 12:01:46 +05:30 |
|
Anand Doshi
|
5afe037a5b
|
deprecate sales and purchase return tool
|
2013-03-18 17:59:56 +05:30 |
|
Anand Doshi
|
080f9098c0
|
deprecated sales and purchase return tool
|
2013-03-18 17:57:59 +05:30 |
|
Anand Doshi
|
71bed3116f
|
working on merging sales purchase return into stock entry
|
2013-03-13 12:57:04 +05:30 |
|
Anand Doshi
|
f55922e962
|
fix in chart of accounts balance display
|
2013-03-13 12:53:00 +05:30 |
|
Anand Doshi
|
c9d229ec9e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 11:06:06 +05:30 |
|
Nabin Hait
|
bffbc18b2d
|
fixes in cleanup data
|
2013-03-12 10:41:21 +05:30 |
|
Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Nabin Hait
|
8c7234f270
|
aii: gl_entries for sales invoice
|
2013-03-11 16:32:33 +05:30 |
|
Nabin Hait
|
0e6ce9af17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 18:50:23 +05:30 |
|
Anand Doshi
|
b96fef9802
|
remove cancelled entries from grid report when fetching data based on modified
|
2013-03-07 15:35:36 +05:30 |
|
Nabin Hait
|
ad7266e48d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 11:42:47 +05:30 |
|
Nabin Hait
|
58b2a101ae
|
aii: testcases for sales invoice gl entries
|
2013-03-07 11:42:14 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Nabin Hait
|
a72c5127a6
|
aii: gl entries for delivery note
|
2013-03-06 18:50:53 +05:30 |
|
Nabin Hait
|
87b9cd5ba1
|
use get_global_default instead of control panel
|
2013-03-06 13:15:08 +05:30 |
|
Nabin Hait
|
acd52a021b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-05 18:23:50 +05:30 |
|
Nabin Hait
|
46043f2d94
|
messages updated in voucher import tool
|
2013-03-05 18:23:34 +05:30 |
|
Anand Doshi
|
b343a4895c
|
fix in empty col check in voucher import tool
|
2013-03-05 17:24:15 +05:30 |
|
Anand Doshi
|
bec17f078c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-05 14:44:28 +05:30 |
|
Anand Doshi
|
18c1980e38
|
voucher import tool - throw message if empty columns are found
|
2013-03-05 14:44:05 +05:30 |
|
Rushabh Mehta
|
ba7ed4c27c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-05 14:20:24 +05:30 |
|
Rushabh Mehta
|
07287e8b93
|
removed colour fields from txt files
|
2013-03-05 14:19:48 +05:30 |
|
Rushabh Mehta
|
5640a69e78
|
updated sync
|
2013-03-05 14:12:34 +05:30 |
|
Anand Doshi
|
1f3a5c3798
|
use validate value method to validate valuation rate should be greater than 0 in stock entry
|
2013-03-05 12:25:15 +05:30 |
|
Anand Doshi
|
9bba9ed4d2
|
fixes in cform
|
2013-03-04 17:48:31 +05:30 |
|
Nabin Hait
|
4c5af2f33d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-04 15:36:27 +05:30 |
|
Nabin Hait
|
0d20d6fdd2
|
fixes for purchase price list
|
2013-03-04 15:35:45 +05:30 |
|
Rushabh Mehta
|
f934a240ba
|
refactored get_value and added backlink check in 'cancel'
|
2013-03-04 15:34:45 +05:30 |
|
Rushabh Mehta
|
213b180060
|
merge, update bean validations
|
2013-03-01 19:09:06 +05:30 |
|
Rushabh Mehta
|
fee642d547
|
completed Time Log / Time Log Batch
|
2013-03-01 18:24:52 +05:30 |
|
Nabin Hait
|
37ef553f6b
|
fixes for sub_contracting
|
2013-03-01 17:39:41 +05:30 |
|
Nabin Hait
|
1ead851e16
|
datatype validation in voucher import tool
|
2013-03-01 13:21:29 +05:30 |
|
Rushabh Mehta
|
b21eb9ac09
|
added time log batch
|
2013-02-28 18:42:46 +05:30 |
|
Nabin Hait
|
a71ace0d74
|
fixed asynchronus issue in purchase cycle
|
2013-02-28 16:30:53 +05:30 |
|
billyfordson
|
9b352309c6
|
Adding German translation
|
2013-02-27 17:36:23 +01:00 |
|
Anand Doshi
|
d4d0288540
|
fixed test case of purchase invoice for auto inventory accounting
|
2013-02-27 18:29:13 +05:30 |
|
Anand Doshi
|
55d9a62114
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-02-27 18:14:28 +05:30 |
|
Nabin Hait
|
5418d71fc0
|
sub-contracting rewrite with testcases
|
2013-02-27 18:11:17 +05:30 |
|
Anand Doshi
|
4a7248ee0b
|
commonified some purchase code, added test case for auto inventory accounting for purchase invoice
|
2013-02-27 18:10:30 +05:30 |
|
Anand Doshi
|
9d794fccc1
|
fixes in jv test and purchase invoice test
|
2013-02-27 13:34:22 +05:30 |
|
Anand Doshi
|
a1d4b78fbe
|
started with Auto Inventory Accounting - test case for purchase receipt
|
2013-02-26 18:09:47 +05:30 |
|
Rushabh Mehta
|
29786e38df
|
added get_value, fixed appframe from Single
|
2013-02-26 14:27:03 +05:30 |
|
Nabin Hait
|
d09cec71da
|
fixes in print format for recurring invoice period
|
2013-02-26 11:13:21 +05:30 |
|
Nabin Hait
|
6dfa84164e
|
fixes in new gross profit report
|
2013-02-25 18:57:41 +05:30 |
|
Anand Doshi
|
258c3fb228
|
new gross profit report based on query report
|
2013-02-25 18:17:51 +05:30 |
|
Rushabh Mehta
|
e4eb89b02a
|
added new language and filters in query reports
|
2013-02-25 13:00:16 +05:30 |
|
Rushabh Mehta
|
9e02949821
|
updated language and separated slickgrid files
|
2013-02-25 11:05:27 +05:30 |
|
Rushabh Mehta
|
586ee7603f
|
query report reload fix
|
2013-02-23 14:39:53 +05:30 |
|
Anand Doshi
|
05f90651f6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-22 18:02:43 +05:30 |
|
Anand Doshi
|
ebae9ae272
|
fix in financial statements
|
2013-02-22 18:02:06 +05:30 |
|
Rushabh Mehta
|
90098d2ebd
|
new employee_leave_balance_report
|
2013-02-22 17:54:50 +05:30 |
|
Rushabh Mehta
|
c359a58766
|
added Item Name in pending type query reports
|
2013-02-22 10:48:07 +05:30 |
|
Rushabh Mehta
|
f41dd39286
|
added language
|
2013-02-21 16:57:54 +05:30 |
|
Anand Doshi
|
51fc7c0683
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-21 12:23:58 +05:30 |
|
Nabin Hait
|
8f7899a642
|
added stopped condition in pending to deliver/received/billed report
|
2013-02-21 11:44:08 +05:30 |
|
Anand Doshi
|
59d8a76e60
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
hr/doctype/leave_application/locale/_messages_py.json
hr/doctype/leave_block_list/locale/_messages_doc.json
public/js/locale/_messages_js.json
setup/doctype/email_digest/locale/_messages_doc.json
setup/doctype/global_defaults/global_defaults.txt
|
2013-02-21 11:09:43 +05:30 |
|
Nabin Hait
|
6f1a5ec209
|
Disable rounded total feature
|
2013-02-20 16:25:05 +05:30 |
|
Rushabh Mehta
|
2fe861fa71
|
defaults cleanup
|
2013-02-19 15:54:15 +05:30 |
|
Rushabh Mehta
|
5117d9c266
|
refactored defaults, bin material request wip
|
2013-02-19 15:27:31 +05:30 |
|
Rushabh Mehta
|
c53231a841
|
model_wrapper is now bean, refactoring defaults
|
2013-02-18 18:24:28 +05:30 |
|
Anand Doshi
|
89869cf635
|
fixes in purchase invoice listing
|
2013-02-18 12:09:29 +05:30 |
|
Rushabh Mehta
|
aae45532f3
|
request: remove _type from form
|
2013-02-15 14:39:34 +05:30 |
|
Anand Doshi
|
fb67605042
|
fix in trend analyzer - show currency only for amt field
|
2013-02-14 15:50:01 +05:30 |
|
Anand Doshi
|
e74a1f2b85
|
fixes in outstanding amount calculation on cancellation of payment entry
|
2013-02-14 13:38:12 +05:30 |
|
Nabin Hait
|
362455e749
|
fix outstanding and floating point issue in gl entry
|
2013-02-13 15:50:39 +05:30 |
|
Rushabh Mehta
|
1c9e96f3a1
|
Merge branch 'edge'
|
2013-02-13 12:00:27 +05:30 |
|
Nabin Hait
|
bcbc2f6ce5
|
c-form fixes
|
2013-02-13 11:30:14 +05:30 |
|
Rushabh Mehta
|
51709b7eb3
|
Merge branch 'master' into edge
|
2013-02-12 19:23:48 +05:30 |
|
Rushabh Mehta
|
4b9827a5fc
|
upgraded test_runner, now can run multiple tests
|
2013-02-12 19:20:39 +05:30 |
|
Nabin Hait
|
4860754407
|
call calc_adjustment_amount function only if docstatus is zero
|
2013-02-12 18:49:55 +05:30 |
|
Nabin Hait
|
cd50c2513f
|
removed wrong validation
|
2013-02-12 15:46:24 +05:30 |
|
Nabin Hait
|
945b39f984
|
fixes in payemnt reconciliation
|
2013-02-12 15:17:25 +05:30 |
|
Nabin Hait
|
b31c222c0e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-11 13:57:48 +05:30 |
|
Nabin Hait
|
fdb4d49ae3
|
get_query
|
2013-02-11 13:56:47 +05:30 |
|
Rushabh Mehta
|
af222dc6b2
|
updated language
|
2013-02-11 11:49:18 +05:30 |
|
Rushabh Mehta
|
60135df6fd
|
updated language
|
2013-02-11 11:44:12 +05:30 |
|
Anand Doshi
|
872359c61c
|
pass purchase invoice test cases
|
2013-02-08 19:34:18 +05:30 |
|
Anand Doshi
|
3c1fee7c6e
|
validate fiscal year reused from accounts.utils
|
2013-02-08 19:28:32 +05:30 |
|
Anand Doshi
|
8595fcf910
|
purchase invoice taxes and totals calculations with test cases
|
2013-02-08 19:28:14 +05:30 |
|
Anand Doshi
|
a11a21c6a9
|
changed _Test Fiscal Year to _Test Fiscal Year 2013
|
2013-02-08 19:27:38 +05:30 |
|
Nabin Hait
|
2604a99072
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-08 14:08:28 +05:30 |
|
Nabin Hait
|
0739e7f573
|
fixed conflict
|
2013-02-08 14:07:29 +05:30 |
|
Nabin Hait
|
a76a0687ef
|
get_query continued
|
2013-02-08 14:04:13 +05:30 |
|
Anand Doshi
|
6a5efa972b
|
added test record for purchase invoice test case
|
2013-02-08 13:57:05 +05:30 |
|
Anand Doshi
|
6209046772
|
added some test records
|
2013-02-07 19:47:34 +05:30 |
|
Nabin Hait
|
dc95c15002
|
changed args to filters in get_query
|
2013-02-07 12:08:38 +05:30 |
|
Nabin Hait
|
e343ac7173
|
fixes in voucher import tool
|
2013-02-06 18:42:26 +05:30 |
|