Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,124 Commits 3 Branches 0 Tags 1 GiB
59de1e23bc
Commit Graph

591 Commits

Author SHA1 Message Date
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Nabin Hait
7c60fc13b2 reports fixed: itemwise sales/delivery report 2012-05-03 18:22:32 +05:30
Nabin Hait
d8df7b5884 quotation fix 2012-05-03 17:49:45 +05:30
Nabin Hait
dc7ffe47b2 fixes in quotation 2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648 fixes in quotation 2012-05-03 14:41:35 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Anand Doshi
98ae634c50 fixes in sales order item widths 2012-05-01 18:31:40 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-04-16 13:41:06 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468 Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf fixed price list currency issue 2012-04-05 16:29:02 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	version.num
 2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
 2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +05:30
Rushabh Mehta
9d0ea6a5f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:25:22 +02:00
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216 fix in sales common regarding date formatting 2012-03-23 11:12:03 +05:30
Rushabh Mehta
1952f5b033 lead listview 2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731 lead listview 2012-03-22 12:10:49 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30
Rushabh Mehta
437c1b512c listview update and form fix 2012-03-20 18:45:28 +05:30
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Nabin Hait
31e0eacb7a Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:54:11 +05:30
Nabin Hait
fdab486720 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:43:07 +05:30
Nabin Hait
422f7e99db Update erpnext/selling/doctype/customer/customer.txt 2012-03-19 15:37:03 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Nabin Hait
deac31fd2d Update erpnext/selling/doctype/sales_common/sales_common.py 2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984 cost center will be fetched from other charges master 2012-03-16 15:11:02 +05:30
Rushabh Mehta
2438de4c9b fixed tags in list2 2012-03-15 16:43:46 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
9f89e35ebe search selector fix for link 2012-03-09 17:51:39 +05:30
Rushabh Mehta
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +05:30
Rushabh Mehta
9a1bdf7224 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Nabin Hait
928e89a359 validation added in enquire 2012-03-07 13:11:24 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30
Rushabh Mehta
60871c3f54 merge, doclist2 2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0 doclist2 2012-03-05 18:28:33 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Nabin Hait
07e9ff3d30 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05 field order changed 2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987 fix in delivery note detail double entry 2012-03-03 16:27:48 +05:30
Nabin Hait
40c514612b price list rate hiding issue 2012-03-02 16:06:33 +05:30
Nabin Hait
7e6b62eafd print hide issue 2012-03-02 15:12:52 +05:30
Nabin Hait
fae852eb78 print hide issue 2012-03-02 15:10:51 +05:30
Nabin Hait
0d155a9135 print hide issue 2012-03-02 14:57:44 +05:30
Nabin Hait
88986ca007 column break print hide issue 2012-03-02 12:29:08 +05:30
Anand Doshi
e306a1f5e1 fix in sales and purchase common column hide 2012-03-01 19:25:33 +05:30
Nabin Hait
96639d76b2 fixed indentation issue for custom script 2012-03-01 18:11:27 +05:30
Nabin Hait
be0b090d27 voucher date removal issue fixed 2012-03-01 17:31:51 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Nabin Hait
177ca8dbbd Description changed 2012-03-01 10:54:34 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
085617ed12 merge latest 2012-02-21 17:31:04 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Nabin Hait
8e9b578c00 expected delivery date can be equal to po date, not before po date 2012-02-21 13:35:28 +05:30
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +05:30
Nabin Hait
ab90ee04f5 callback issues and item default get most priority 2012-02-15 14:28:02 +05:30
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Anand Doshi
82cfe4b28d Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 15:30:24 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
b0fd0b3615 Edited through patch 2012-02-13 11:34:36 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
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
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
Nabin Hait
7b095e97ad Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:25:36 +05:30
Nabin Hait
efc2c327cf Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:24:31 +05:30
Nabin Hait
4faf99424a Modified validation for duplicate item 2011-11-16 14:20:45 +05:30
Nabin Hait
65a053abe6 Modified validation for duplicate item 2011-11-16 14:19:26 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
61985ac5fa get_query modified for item in quotation 2011-09-30 17:46:08 +05:30
Nabin Hait
73c4a4a154 removed make_feed() function 2011-09-16 11:24:54 +05:30
Rushabh Mehta
53ba83158c fixes to startup 2011-09-15 15:06:23 +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
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30