Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,364 Commits 3 Branches 0 Tags 1 GiB
9908d6e4be
Commit Graph

65 Commits

Author SHA1 Message Date
Anand Doshi
a629fa3f05 Merge branch 'stable' into latest 2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a Fix in import docs containing utf-8 encoding 2012-02-07 17:57:40 +05:30
Anand Doshi
b65363aa46 Merge branch 'stable' into latest 2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45 Fix in default customer group fetch while converting lead to customer 2012-02-07 14:28:05 +05:30
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest 
Conflicts:
	version.num
 2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest 
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
 2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Anand Doshi
0c9cde9f62 Merge branch 'stable' into latest 
Conflicts:
	version.num
 2012-02-02 12:43:39 +05:30
Anand Doshi
354dd9b35a Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing) 2012-02-02 12:42:14 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest 
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
 2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Anand Doshi
6c95ccb8f5 Net total calculation fix 2012-01-30 14:28:31 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Anand Doshi
74d1b65105 changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch 2012-01-27 12:25:09 +05:30
Anand Doshi
9a7ea9285e Customer Address Contact report 2012-01-23 18:32:20 +05:30
Anand Doshi
a170418ed0 Fixes in floating point issues 2012-01-23 14:09:06 +05:30
Anand Doshi
da68ce8b84 Fix to other charges total 2012-01-20 15:02:41 +05:30
Anand Doshi
60c42d2e1c Fix to other charges total 2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972 Fix to other charges total 2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3 Other Charges total fixed to 2 decimals 2012-01-20 14:29:40 +05:30
Anand Doshi
ff54778418 Fix in sales_common 2012-01-20 13:20:21 +05:30
Anand Doshi
edb45c6ce5 Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js 2012-01-19 17:12:17 +05:30
Anand Doshi
dc914276a9 Merge branch 'master' into latest 2012-01-16 17:39:33 +05:30
Anand Doshi
d487f782a4 Fix: change module name from material_management to stock in an import in installation_note 2012-01-16 17:38:19 +05:30
Anand Doshi
077416300e Fix: floating point issue on submission of RV and creation of GL Entry 2012-01-16 16:02:47 +05:30
Anand Doshi
90f6e55c29 Changes in Inclusive Rate Taxes precision 2012-01-16 14:13:39 +05:30
Anand Doshi
610f9728ab Removing ref_rate back calculation as it injects floating point issue 2012-01-13 17:43:22 +05:30
Anand Doshi
4badeecf36 Reverting toFixed issue for grand total 2012-01-13 15:45:58 +05:30
Anand Doshi
560883145c Fix to floating point issue in grand total 2012-01-13 14:35:42 +05:30
Anand Doshi
265f3edb8f On clicking Get Charges, also pull the field included_in_print_rate 2012-01-12 14:56:26 +05:30
Anand Doshi
58574acfbc Fix: Bug in Actual Tax Rate due to inclusive rate 2012-01-11 13:39:06 +05:30
Anand Doshi
35041607be Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate 2012-01-11 11:21:58 +05:30
Anand Doshi
3a82dfd171 Rename Indent to Purchase Requisition 2012-01-10 16:56:11 +05:30
Anand Doshi
95c9d30cfd Removed unnecessary console logs 2012-01-10 11:52:43 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
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
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext 
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
 2011-12-21 12:34:13 +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
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +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