Commit Graph

483 Commits

Author SHA1 Message Date
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
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