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

467 Commits

Author SHA1 Message Date
Anand Doshi
34b9f5b1e0 Fix new transaction entries issue 2011-12-30 16:02:03 +05:30
Nabin Hait
c184dc56a4 Error fixed in uom conversion rate fetching 2011-12-30 13:29:45 +05:30
Nabin Hait
a21156d4d3 Removed msgprint 2011-12-30 11:16:15 +05:30
Nabin Hait
21d0b68a7d Fixes in pending_patches 2011-12-29 15:39:26 +05:30
Nabin Hait
0dfb8e939c Pending patches to be run from patch.py 2011-12-29 14:40:05 +05:30
Nabin Hait
48285ede08 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-29 12:57:31 +05:30
Nabin Hait
6182b929bf set default value as blank insead of None through manage account 2011-12-29 12:56:55 +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
Anand Doshi
7a4d9dbd3e Fixes in support ticket attachments 2011-12-27 19:40:10 +05:30
Anand Doshi
c50f605450 Enabled Attachments in Support Ticket 2011-12-27 17:44:30 +05:30
Anand Doshi
08eff708bf Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 17:24:19 +05:30
Anand Doshi
20f0d305cb Allow attachments in support ticket 2011-12-27 17:09:55 +05:30
Nabin Hait
4febc84f13 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 16:42:27 +05:30
Nabin Hait
3029474b0e Fixes in recurring invoice 2011-12-27 16:42:03 +05:30
Nijil Y
04eb52dbe3 added fields 2011-12-26 15:30:45 +05:30
Nijil Y
68de3687f4 added fields 2011-12-26 15:24:55 +05:30
Nabin Hait
3f7d7077f0 Merge pull request #183 from nijil/master 
allignment and error fix
 2011-12-25 23:13:05 -08:00
Nabin Hait
a0778fec61 Reload gl mapper patches 2011-12-26 12:28:14 +05:30
Nijil Y
2a59030e05 task notification fix 2011-12-26 12:00:30 +05:30
Nabin Hait
16aacdfeeb Error fixed in ticket 2011-12-26 11:37:52 +05:30
Nabin Hait
cf0163d09e Patch updated 2011-12-26 11:13:49 +05:30
Nabin Hait
f7e1569207 ticket.py modified 2011-12-26 11:08:55 +05:30
Nabin Hait
a0286e986e patch updated 2011-12-26 11:08:32 +05:30
Nabin Hait
40deced91c Merge pull request #180 from nijil/master 
Task Notification
 2011-12-25 21:24:33 -08:00
Nabin Hait
56f7ccbe70 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-23 18:26:34 +05:30
Nabin Hait
c6359a9179 Patch to update against_voucher in gle for jv aganst jv 2011-12-23 18:26:17 +05:30
Nabin Hait
382dc6e819 GL Mapper changes for JV 2011-12-23 18:25:11 +05:30
Nijil Y
a4e8d1e983 . 2011-12-23 18:01:40 +05:30
Nijil Y
0cfecf2920 email message fix for task 2011-12-23 17:54:07 +05:30
Nijil Y
0de918204d Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 17:35:39 +05:30
Nijil Y
cc64682baa fixed 2011-12-23 17:35:18 +05:30
Nijil Y
89e5624730 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:21:51 +05:30
Nijil Y
9239afa222 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:18:49 +05:30
Nijil Y
cc0e502d0f scheduler 2011-12-23 15:08:43 +05:30
Anand Doshi
8d53f7635a Merge pull request #179 from anandpdoshi/master 
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
 2011-12-23 00:21:53 -08:00
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Nijil Y
4d64379aa6 scheduler added to project control for reminder 2011-12-23 12:32:08 +05:30
Nijil Y
b8eab4f2da Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 12:19:46 +05:30
Nijil Y
f1e98b9d8b Scheduler added for reminder notification - which will be sent 2 days before the task begins 2011-12-23 12:01:31 +05:30
Anand Doshi
d9fc4c07c9 Merge pull request #178 from anandpdoshi/master 
Fix: Email digest gets deleted if even one is disabled
 2011-12-22 22:27:47 -08:00
Anand Doshi
bd269cdbe7 Fix: Email digest gets deleted if even one is disabled. 2011-12-23 11:55:00 +05:30
Nabin Hait
e80496cef4 Consider description also to check item duplication in purchase cycle 2011-12-23 11:25:37 +05:30
Nabin Hait
e323ef20b0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 19:05:08 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Anand Doshi
f5d5f10ff3 Remove "Add Recipients" button from Email Digest (again!) 2011-12-22 19:02:15 +05:30
Anand Doshi
4714424de0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 18:22:46 +05:30
Anand Doshi
0188df1609 Amended the patch to import class Document 2011-12-22 18:21:57 +05:30
Anand Doshi
27b05eac7a Merge pull request #176 from anandpdoshi/master 
Patch to enable income year to date summary in email digest
 2011-12-22 04:48:57 -08:00
Anand Doshi
68f3967de0 Patch to enable income year to date summary in email digest 2011-12-22 18:18:10 +05:30
Anand Doshi
a4db9e9b5a Merge pull request #175 from anandpdoshi/master 
Added feature: Income Year To Date in Email Digest
 2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf Added feature: Income Year To Date in Email Digest 2011-12-22 18:02:36 +05:30
Nijil Y
f2a5c290b3 Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-22 17:43:46 +05:30
Nijil Y
b3058a3d5a Task Notification donw, reminder left 2011-12-22 17:39:18 +05:30
Anand Doshi
6d0be02364 Merge pull request #174 from anandpdoshi/master 
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
 2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7 Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body 2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4 Merge pull request #173 from anandpdoshi/master 
Dont show bank balance if no ledger of type "Bank or Cash"
 2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408 Dont show bank balance if no ledger of type "Bank or Cash" 2011-12-22 17:23:11 +05:30
Anand Doshi
99479bdb7f Merge pull request #172 from anandpdoshi/master 
remove previous field property setter
 2011-12-22 01:50:07 -08:00
Anand Doshi
f2f4c87bb6 remove previous field property setter 2011-12-22 15:19:16 +05:30
Anand Doshi
d1bfe839fa Merge pull request #171 from anandpdoshi/master 
Patch to update idx which starts with 0
 2011-12-22 01:37:04 -08:00
Anand Doshi
9ca7e5255b Patch to update idx.. start idx from 1 2011-12-22 15:05:14 +05:30
Nijil Y
8acb043a8a update 2011-12-22 13:08:25 +05:30
Nabin Hait
7e812bbee0 Error fixed in patch 2011-12-22 12:58:34 +05:30
Nabin Hait
6998261a7e Error fixed in auto indent patches 2011-12-22 12:56:57 +05:30
Nabin Hait
20c87531cb Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 12:54:39 +05:30
Nabin Hait
9e8249fea1 Error fixed in bin 2011-12-22 12:54:13 +05:30
Anand Doshi
5a32f78bf3 Merge pull request #170 from anandpdoshi/master 
calls on_update method of email_digest obj for creating a scheduler entry
 2011-12-21 22:59:31 -08:00
Anand Doshi
248f8f5687 Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry 2011-12-22 12:26:36 +05:30
Anand Doshi
c9b2743e1c Merge pull request #168 from anandpdoshi/master 
Fix Image attachments and Enable Email Digests
 2011-12-21 22:45:13 -08:00
Anand Doshi
972b165850 Modified deploy_email_digest to enable all the default email digests 2011-12-22 12:04:28 +05:30
Nabin Hait
b9e8a41cd2 Account and cost center get_query changes for other charges table 2011-12-21 17:33:57 +05:30
Nijil Y
36f58835e6 Update erpnext/patches/auto_indent.py 2011-12-21 16:35:43 +05:30
Nijil Y
c62953579d fix 2011-12-21 16:32:42 +05:30
Nijil Y
f800dc02f1 fix 2011-12-21 16:20:39 +05:30
Anand Doshi
c111803a4a Fixed image attachment in profile settings 2011-12-21 14:55:14 +05:30
Nijil Y
07b03fbe09 Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 14:54:34 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
b36bebe9f0 Update erpnext/stock/doctype/bin/bin.py 2011-12-21 14:53:04 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898 Company master link in global defaults 2011-12-21 13:24:10 +05:30
Nijil Y
9b6fc0f83d Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 13:24:02 +05:30
Nabin Hait
520de0529f Merge branch 'master' of github.com:webnotes/erpnext 2011-12-21 12:51:38 +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
Nijil Y
16ca593bbf Update erpnext/patches/auto_indent.py 2011-12-21 12:20:07 +05:30
Nijil Y
4d6a71c5f2 Update erpnext/patches/auto_indent.py 2011-12-21 11:56:42 +05:30
Nijil Y
35aa35bea3 Update erpnext/patches/auto_indent.py 2011-12-21 11:50:20 +05:30
Nabin Hait
53ef4009ba Fixes in patches 2011-12-21 11:22:32 +05:30
Nijil Y
205e042113 patch file 2011-12-20 21:14:43 +05:30
Nijil Y
dc0461296d Email Notification for Tasks 2011-12-20 21:13:58 +05:30
Anand Doshi
146f47faab Merge pull request #167 from anandpdoshi/master 
Patch to remove extra button from Email Digest Form
 2011-12-20 05:40:59 -08:00
Nabin Hait
63b94c42e4 Price list patch 2011-12-20 19:09:23 +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
7c03cfad6a Default Price List Currency fld added in Global Defaults 2011-12-20 18:50:41 +05:30
Nabin Hait
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Anand Doshi
6a605b47ef Patch to remove 'Add Recipients' button from Email Digest form 2011-12-20 18:31:57 +05:30
Nijil Y
04da8741c3 fix 2011-12-20 18:09:43 +05:30
Nijil Y
d82e8df7e5 patch update for auto indent with email notify 2011-12-20 17:30:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13 Error fixed in cust group 2011-12-20 11:48:27 +05:30
Nabin Hait
b8cec492c5 Fixed issue in c-form patch 2011-12-16 16:48:17 +05:30
Nabin Hait
488bcc8700 reload_employeewise_balance_leave_report patch updated 2011-12-16 16:29:31 +05:30
Nabin Hait
e3daffe477 reload_employeewise_balance_leave_report 2011-12-16 16:28:26 +05:30
Nabin Hait
3bfeefafcd Modified patch 2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495 Modified patch 2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44 Return if old patch.py executed anyway 2011-12-16 10:17:26 +05:30
Nabin Hait
b2150de64b Freezing Error fixed in purchase invoice 2011-12-15 16:29:04 +05:30
Nabin Hait
9a0d05d354 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4 remove depricated default fileds 2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0 patch to remove old control panel email settings 2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5 patch to remove old control panel email settings 2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master 
Accounts Default Form Fix
 2011-12-14 22:28:52 -08:00
Anand Doshi
a51aefbced Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 20:36:11 +05:30
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
407ebb9e41 Merge pull request #161 from anandpdoshi/master 
Resolved bug: when account of type 'Bank or Cash' does not exists
 2011-12-14 06:36:32 -08:00
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext 
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
 2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Nabin Hait
44bba97dc9 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 18:09:39 +05:30
Nabin Hait
b93ea233ff Error fixed in task 2011-12-14 18:09:13 +05:30
Anand Doshi
c2a9cca4fd Change in add user dialog box: 
Now it includes First Name, Last Name and Password field
if run as a standalone app
 2011-12-14 17:12:12 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
b40f826c5a . 2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master 
Commented print statement in email_digest.py
 2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +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
536e0cb1c4 fixes in patch 2011-12-13 19:05:13 +05:30
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
f6a3441d99 patch 2011-12-13 18:31:42 +05:30
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
f5ff4434df Patch to reload Task doctype of Projects Module 2011-12-13 18:13:23 +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
130ae98675 Changes in dashboard start date and end date default logic such that the 
conditions for fiscal year range are met
 2011-12-12 20:24:06 +05:30
Anand Doshi
3a23a5740e In Dashboard, display a customer friendly error message when the start and end dates 
are not within a fiscal year
 2011-12-12 19:50: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
Anand Doshi
deb816d30c Patch to remove duplicate entries created due to change in 
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
 2011-12-12 12:41:36 +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
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064 Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest 2011-12-08 19:36:29 +05:30