Commit Graph

136 Commits

Author SHA1 Message Date
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Anand Doshi
10748d6bdb Merge pull request #190 from anandpdoshi/master
Changed link for customer master and supplier master in accounts browser
2011-12-28 03:49:13 -08:00
Anand Doshi
eaa6d21691 Changed link for customer master and supplier master in accounts browser 2011-12-28 17:18:09 +05:30
Nabin Hait
9e08c12a10 Default price list currency issue in delivery note fixed 2011-12-28 16:30:48 +05:30
Nabin Hait
3029474b0e Fixes in recurring invoice 2011-12-27 16:42:03 +05:30
Nabin Hait
382dc6e819 GL Mapper changes for JV 2011-12-23 18:25:11 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nabin Hait
60fc54a9ba Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form 2011-12-20 18:59:26 +05:30
Nabin Hait
b2150de64b Freezing Error fixed in purchase invoice 2011-12-15 16:29:04 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
f21ceb283c Arranged field order in item table 2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
08d803791d Merge branch 'master' of git://github.com/nijil/erpnext 2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6 notification email for recurring invoice 2011-12-13 18:48:24 +05:30
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
5245e6547b Change path of images in accounts browser and sales browser 2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713 Validation added in c-form 2011-12-12 14:16:16 +05:30
Nijil Y
fdc7fc62a5 payable voucher.js 2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7 pvdetail 2011-12-12 10:31:23 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nabin Hait
fd20340576 Introduced C-form for Indian customer 2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648 Discount in purchase cycle 2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5 Discount in purchase cycle 2011-12-08 16:09:18 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Nabin Hait
a4fdc84fda Introduced recurring invoices 2011-12-06 15:04:47 +05:30
Nijil
2f82c29348 .. 2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe payable voucher txt 2011-11-24 15:14:09 +05:30
Nijil
c37dad26d9 txt files 2011-11-24 15:07:54 +05:30
Nabin Hait
e92066fa80 modified fld prop in gl entry and index patch 2011-11-24 15:04:47 +05:30
Anand Doshi
956d665738 Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
96e5343519 Marked GLEntry as Not In Create 2011-11-24 13:51:09 +05:30
Nabin Hait
04176e62d8 fixed error in internal reco 2011-11-23 12:15:42 +05:30
Nijil
54eb735a47 Added Discount in Purchase Cycle 2011-11-22 15:12:00 +05:30
Nabin Hait
f164b269db Merge branch 'master' of github.com:webnotes/erpnext 2011-11-16 16:39:16 +05:30
Nabin Hait
b0fa2af45b Rewritten landed cost wizard 2011-11-16 16:20:37 +05:30
Anand Doshi
bf41aef7f0 Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
2011-11-16 01:20:33 -08:00
Anand Doshi
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Anand Doshi
0900756510 Merge pull request #143 from anandpdoshi/master
Changes in Sales Invoice Print Formats
2011-11-16 00:34:36 -08:00
Anand Doshi
9fe4331862 Changes in Sales Invoice Print Format 2011-11-16 14:03:52 +05:30
Anand Doshi
ded71563c8 Merge pull request #142 from anandpdoshi/master
New Print Formats as part of erpnext repository
2011-11-16 00:02:43 -08:00
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Nabin Hait
0c92493c81 Fixed check_for_acc_of_supplier validation 2011-11-16 10:12:32 +05:30
Nabin Hait
5b7badaf20 supplier account head validated with supplier 2011-11-11 12:37:53 +05:30
Nabin Hait
cc02fd445c Repair button only visible after submit 2011-11-07 12:14:28 +05:30
Nabin Hait
612efe843b POS Setting js code restored from history 2011-10-21 16:19:58 +05:30
Nabin Hait
57dd62d790 project column moved to item table in pur cycle 2011-10-20 19:19:07 +05:30
Nabin Hait
69554511da fixes in patch 2011-10-19 16:35:39 +05:30
Nabin Hait
7762bdaf77 Letter head issue fixed in print format 2011-10-19 15:05:26 +05:30
Nabin Hait
1a1ce709e0 Changes regarding POS fields 2011-10-13 14:08:33 +05:30
Nabin Hait
ee9efb568b flds added in mapper 2011-10-12 12:42:07 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163 packing slip related changes and test case for item 2011-10-11 13:57:48 +05:30
Nabin Hait
2810691979 field hide/unhide for pos 2011-10-10 12:33:43 +05:30
Nabin Hait
6a0561612f cost center groupto ledger and vice versa 2011-10-10 12:23:10 +05:30
Nabin Hait
1971942db8 purchase tax mapping while pulling 2011-10-05 14:56:16 +05:30
Nabin Hait
c8d5625763 removed trashed profile from user search result 2011-09-27 15:26:29 +05:30
Nabin Hait
d9a16a282c deleted gl_entry.js file 2011-09-27 15:10:07 +05:30
Nabin Hait
ec451da2f4 Re-written update_against_document_in_jv function in RV and PV 2011-09-27 12:47:59 +05:30
Nabin Hait
e2df68bb5b reload internal reconciliation 2011-09-27 12:47:09 +05:30
Nabin Hait
80ed6b25e8 deleted gl_control.js file 2011-09-27 11:53:23 +05:30
Nabin Hait
3c8a50c257 Trial balance opening issue fixed if there is no prev year 2011-09-27 11:16:30 +05:30
Nabin Hait
a77cea2b90 Dont add opening entries in account balance debit, credit column 2011-09-27 11:14:54 +05:30
Nabin Hait
c752d075e6 fixed issue in reseting in opening balance, clear bal only that company 2011-09-27 11:04:24 +05:30
Nabin Hait
c034e3d531 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-27 10:55:24 +05:30
Nabin Hait
39297e5775 update_nsm_model in cost center on_trash() 2011-09-27 10:36:17 +05:30
Nabin Hait
d223d12308 Rewritten update_against_document function 2011-09-26 18:57:43 +05:30
Nabin Hait
5f2046496b Internal Reconciliation: for knock out booking and payment entries 2011-09-26 18:56:02 +05:30
Nabin Hait
2736fd59ca fixed cancelled gl entry issue in period closing voucher 2011-09-26 12:55:52 +05:30
Nabin Hait
f060d0cd16 contact address will be fetched in sales invoice onload when come through mapper 2011-09-16 17:28:49 +05:30
Rushabh Mehta
2adbd89ada Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:09:14 +05:30
Rushabh Mehta
53ba83158c fixes to startup 2011-09-15 15:06:23 +05:30
Nabin Hait
3b19f6b7c8 opening balance fixes in general ledger 2011-09-15 14:38:54 +05:30
Rushabh Mehta
0aed26d83d moved report to folder 2011-09-15 13:00:46 +05:30
Rushabh Mehta
2773940db1 merged from master 2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
aa7b05aaeb Merge branch 'master' of github.com:webnotes/erpnext 2011-09-06 12:47:51 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30