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

1797 Commits

Author SHA1 Message Date
Nabin Hait
d2686b1c31 reload doctype 2012-01-05 11:16:18 +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
Nabin Hait
db126e80b8 pos setting patch 2012-01-03 11:10: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
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
Anand Doshi
c50f605450 Enabled Attachments in Support Ticket 2011-12-27 17:44:30 +05:30
Nabin Hait
a0778fec61 Reload gl mapper patches 2011-12-26 12:28:14 +05:30
Nabin Hait
cf0163d09e Patch updated 2011-12-26 11:13:49 +05:30
Nabin Hait
a0286e986e patch updated 2011-12-26 11:08:32 +05:30
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
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
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
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
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
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
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
Nijil Y
36f58835e6 Update erpnext/patches/auto_indent.py 2011-12-21 16:35:43 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +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
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
Anand Doshi
6a605b47ef Patch to remove 'Add Recipients' button from Email Digest form 2011-12-20 18:31:57 +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
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
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
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
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
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
Nijil Y
f6a3441d99 patch 2011-12-13 18:31:42 +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
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
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +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
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Nabin Hait
b28d6dc617 Repost stock patch 2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d Recurring invoices patch 2011-12-06 15:10:48 +05:30
Anand Doshi
8c10de6c1a Modified patch to create a DocType Label record for DocLayer 2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434 pvdetail and patch 2011-11-24 16:18:42 +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
be14e021b9 Reload GL Entry doctype 2011-11-24 13:57:46 +05:30
Anand Doshi
6b8d0bfb2a Added patch to reload doclayer, doclayer field and print format doctypes 2011-11-23 18:39:08 +05:30
Nabin Hait
5f9ceb8dc8 filter property changed in address 2011-11-23 13:19:20 +05:30
Nijil
6800ad55bd patch for Discount Rate 2011-11-22 15:21:42 +05:30
Nabin Hait
2690e72c14 updated reco patch 2011-11-21 17:27:36 +05:30
Nabin Hait
38477a3616 patch for stock reconciliation 2011-11-21 17:16:48 +05:30
Nabin Hait
bc60c1f29c fixed patch 2011-11-17 16:59:29 +05:30
Nabin Hait
92ec8d26eb reload LC wizard 2011-11-17 15:03:05 +05:30
Nabin Hait
1a8831f476 reload LC wizard 2011-11-17 15:00:55 +05:30
Nabin Hait
a8da0fecb5 Account link query changed in LC wizard 2011-11-17 14:47:05 +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
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Anand Doshi
96fd8bec9b Changes in Sales Invoice Print Formats 2011-11-16 14:02:30 +05:30
Anand Doshi
c573fb8eed Modified patch install_print_formats to reload the newly added Print Formats 2011-11-16 13:31:21 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Anand Doshi
86e91e5dce Changes in patch for installation of new print formats 2011-11-15 18:06:16 +05:30
Anand Doshi
f8b01097ac Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	index.html
 2011-11-15 15:24:11 +05:30
Anand Doshi
3cb68e17b9 New Print Formats 2011-11-15 15:22:44 +05:30
Nabin Hait
ff72835ad9 Qty consumed per unit field type currency to data 2011-11-10 14:37:47 +05:30
Nabin Hait
33e19480ae UOM field added in BOM, will be fetched from item master 2011-11-09 13:53:16 +05:30
Nabin Hait
93ba4fbaa4 Fixes related to finding prev sle 2011-11-08 15:30:04 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Nabin Hait
30d34c4311 sal manager reload patch 2011-11-07 11:07:50 +05:30
Nabin Hait
990a5eacca sal manager reload patch 2011-11-07 10:51:29 +05:30
Anand Doshi
30cf682e46 Change criteria name of employeewise_balance_leave_report 2011-10-31 17:41:04 +05:30
Nabin Hait
d0c9d422af patch for project changes in pur cycle 2011-10-20 19:21:03 +05:30
Nabin Hait
69554511da fixes in patch 2011-10-19 16:35:39 +05:30
Nabin Hait
2eb5ae48f7 patch: default print format for invoice is standard 2011-10-19 16:06:37 +05:30
Nabin Hait
13800440f1 fixed issue in patch 2011-10-19 15:38:42 +05:30
Nabin Hait
d751c1d40d patch for reloading print format and new POS format 2011-10-19 15:33:27 +05:30
Nabin Hait
1546003d69 issue fixed in patch 2011-10-18 18:47:08 +05:30
Nabin Hait
0c005421fe Packing slip issues fixed and modified print format 2011-10-18 16:44:20 +05:30
Nabin Hait
e7c4a4011f acc bal repost patch moved in separate file 2011-10-14 19:05:38 +05:30
Nabin Hait
df8304f00b acc bal repost patch moved in separate file 2011-10-14 19:05:08 +05:30
Nabin Hait
c0d7434794 Edited erpnext/patches/patch.py via GitHub 2011-10-14 00:14:31 +05:30
Nabin Hait
989462b669 account balance reposting with freezing current session 2011-10-13 17:33:30 +05:30
Nabin Hait
d84ad942d1 Removed repost patch 2011-10-13 14:04:26 +05:30
Nabin Hait
fe4c4f94da repost account balance patch 2011-10-13 11:07:14 +05:30
Nabin Hait
c7cf94ec7b page break allow_on_submit 2011-10-12 13:16:11 +05:30
Nabin Hait
89a9a26524 page_break column allow_on_submit 2011-10-12 12:41:00 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Nabin Hait
15cad19d7c Serial No moved to Stock module from Support module 2011-10-10 17:10:24 +05:30
Nabin Hait
6a0561612f cost center groupto ledger and vice versa 2011-10-10 12:23:10 +05:30
Nabin Hait
8e54aa882a patch for page break issue 2011-10-07 19:03:19 +05:30
Nabin Hait
ddaa5a33fe reload PO-PR mapper 2011-10-07 12:36:13 +05:30
Nabin Hait
7a941869ab clear cache forcefully 2011-10-07 12:30:48 +05:30
Nabin Hait
c68e045014 deleted duplicate button from QA inspection report 2011-10-05 17:01:16 +05:30
Nabin Hait
da50c0859c features by default on 2011-10-05 12:10:08 +05:30
Nabin Hait
a55eec137f Fieldname changed in Features Setup 2011-10-05 11:47:08 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Nabin Hait
e76e2a1172 reload internal reconciliation 2011-09-27 12:45:48 +05:30
Nabin Hait
7e97d1f390 rebuild all tree through push_patch 
Appraisal score allowed to be fraction
unhide group/ledger field in cost senter for import purpose
update_nsm_model in cost center on_trash()
 2011-09-27 11:34:06 +05:30
Nabin Hait
a28e366c15 deleted duplicate button fron JV 2011-09-22 16:32:02 +05:30
Nabin Hait
b3ce0ecb34 repost account balance through push patch 2011-09-22 16:10:15 +05:30
Nabin Hait
fdb0e362a7 update valuation and bin_aqat patch applicable after 01-09-2009 entries 2011-09-19 12:22:47 +05:30
Nabin Hait
618d65b6ad company delete permission to system manager 2011-09-16 15:55:19 +05:30
Nabin Hait
2d26fe48ed removed sal structure amend permission 2011-09-16 14:35:57 +05:30
Nabin Hait
0b5f9b0475 update valuation and bin_aqat patch 2011-09-16 14:32:23 +05:30
Rushabh Mehta
2773940db1 merged from master 2011-09-15 12:55:25 +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
b5717bd807 patch etc fixes 2011-09-06 12:46:33 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30