Commit Graph

1264 Commits

Author SHA1 Message Date
Akhilesh Darjee
13fa595282 [flat discount] pos print format fixed 2013-12-26 18:14:44 +05:30
Akhilesh Darjee
aebb844da9 [flat discount] added flat discount in print format and all selling doctypes 2013-12-26 18:05:41 +05:30
Akhilesh Darjee
c53dbc7cdf [flat discount] implemented flat discount on client side 2013-12-25 19:46:20 +05:30
Akhilesh Darjee
63aa5fd673 [flat discount] implemented flat discount on server side 2013-12-24 20:30:03 +05:30
Akhilesh Darjee
b09dc46e68 [flat discount] first commit 2013-12-23 15:49:08 +05:30
Anand Doshi
cf6e13d2fe Merge pull request #1148 from nabinhait/reports
Reports
2013-12-17 04:26:36 -08:00
Nabin Hait
592d27e7f1 [reports] general ledger: grid report to script report 2013-12-17 16:20:11 +05:30
Nabin Hait
57e89ff6f1 [reports] general ledger: grid report to script report 2013-12-17 16:09:21 +05:30
Nabin Hait
9d6e10c910 [fix] [minor] precision in gl entry based on currency format 2013-12-17 14:45:55 +05:30
Nabin Hait
ea4f66791e Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-16 15:18:34 +05:30
Nabin Hait
bdb83b1b5a Merge pull request #1177 from nabinhait/hotfix1
[fix] [minor] payment to invoice patching tool
2013-12-12 01:33:42 -08:00
Nabin Hait
c3f2fb7355 [fix] [minor] payment to invoice patching tool 2013-12-12 15:01:12 +05:30
Nabin Hait
2e66a842bb Merge pull request #1170 from akhileshdarjee/master
[fix] [minor] rename fix for customer and supplier
2013-12-11 23:29:18 -08:00
Nabin Hait
ca02db5006 Merge pull request #1175 from nabinhait/hotfix
[fix] [minor] Negative outstanding validation for JV against JV
2013-12-11 23:22:28 -08:00
Nabin Hait
13fc64d732 [fix] [minor] Negative outstanding validation for JV against JV 2013-12-12 12:50:42 +05:30
Akhilesh Darjee
229b246d6d [fix] [minor] production planning tool clear sales order table 2013-12-11 18:49:11 +05:30
Akhilesh Darjee
42a8fc2ee3 [fix] [minor] stashed sales_invoice.txt 2013-12-11 11:15:03 +05:30
Akhilesh Darjee
aebb9f422b [fix] [minor] merge conflict fixes 2013-12-10 18:01:18 +05:30
Akhilesh Darjee
a652347bd1 [fix] [minor] customer_name not visible in sales invoice 2013-12-09 15:52:47 +05:30
Nabin Hait
4a8930fc67 [report]general ledger report migrated to script report 2013-12-06 18:07:23 +05:30
Nabin Hait
c313ca99ff [report]general ledger report migrated to script report 2013-12-06 16:36:23 +05:30
Pratik Vyas
1417c6d58f [hotfix] fix null issue in budget variance 2013-12-06 14:50:06 +05:30
Nabin Hait
40580d5d01 [fix] [minor] Master name validation for customer/supplier/warehouse account 2013-12-04 15:18:11 +05:30
Akhilesh Darjee
72f689b1f9 [fix] [minor] setup print fix in sales invoice 2013-12-04 10:46:55 +05:30
Akhilesh Darjee
9c0569ee2d [report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date 2013-12-02 17:58:23 +05:30
Nabin Hait
86d7139c21 Merge pull request #1107 from akhileshdarjee/master
[fix] [minor] fiscal year validation ignored for test cases
2013-11-27 04:05:36 -08:00
Nabin Hait
752bdbacaf Merge branch '1310' of github.com:webnotes/erpnext 2013-11-27 17:31:04 +05:30
Akhilesh Darjee
ed3e05e181 [fix] [minor] fiscal year validation ignored for test cases 2013-11-27 17:26:25 +05:30
Rushabh Mehta
50989cdd7f Merge pull request #1106 from akhileshdarjee/master
[fix] [minor] make_demo_fresh fixed
2013-11-27 02:48:21 -08:00
Akhilesh Darjee
a8e704d4ab [fix] [minor] make_demo_fresh fixed 2013-11-27 16:16:32 +05:30
Nabin Hait
a07a5084c1 Update payment_made_with_ageing.py 2013-11-27 12:05:32 +05:30
Nabin Hait
a967100990 Update payment_collection_with_ageing.py 2013-11-27 12:05:15 +05:30
Nabin Hait
7cc52d9aaf Merge pull request #1102 from akhileshdarjee/master
[fix] [minor] ageing related reports fixed
2013-11-26 22:31:50 -08:00
Akhilesh Darjee
ca414a96cc [fix] [minor] ageing related reports fixed 2013-11-27 11:53:57 +05:30
Nabin Hait
e3eafd94ff Merge pull request #1100 from akhileshdarjee/master
[fix] [minor] patch for fixing report columns in defaults
2013-11-26 21:26:08 -08:00
Akhilesh Darjee
84ed127e72 [fix] [minor] setup wizard - calculate year end date on change of year start date 2013-11-26 17:29:51 +05:30
Akhilesh Darjee
259208187c [fix] [minor] patch for fixing report columns in defaults 2013-11-26 16:35:50 +05:30
Nabin Hait
5033ef03cf [fix] [minor] merge conflict 2013-11-26 16:04:53 +05:30
Nabin Hait
ad35d1b409 [cleanup] [minor] mis control 2013-11-26 15:39:21 +05:30
Nabin Hait
ac9bcf714d Merge pull request #1097 from akhileshdarjee/master
[fix] fiscal year fix in setup wizard
2013-11-26 01:57:17 -08:00
Nabin Hait
175640d910 Merge branch 'master' of github.com:webnotes/erpnext 2013-11-26 15:04:10 +05:30
Nabin Hait
131939a742 [fix] [minor] rename and merge for customer and supplier 2013-11-26 15:03:51 +05:30
Akhilesh Darjee
d333f20ca0 [fix] [minor] fiscal year fix 2013-11-26 14:57:03 +05:30
Akhilesh Darjee
8cf9ab8188 Merge branch 'master' of github.com:webnotes/erpnext 2013-11-26 14:46:51 +05:30
Akhilesh Darjee
b0a1b3ab47 [fix] [minor] test cases fixes 2013-11-26 14:45:27 +05:30
Rushabh Mehta
cd65b953a3 [fix] Removed voucher import tool webnotes/erpnext#1094 2013-11-26 14:09:59 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
451b01cfe4 [fix] [minor] print hide for purchase net and grand total 2013-11-22 17:17:35 +05:30
Nabin Hait
f1faf2d285 [fix] [minor] print hide for purchase net and grand total 2013-11-22 16:59:28 +05:30