Anand Doshi
|
26814e7bad
|
Remove Get TDS button, which appears twice in JV
|
2012-01-19 14:26:25 +05:30 |
|
Anand Doshi
|
ad2f5d1270
|
Merge branch 'stable'
|
2012-01-19 12:42:11 +05:30 |
|
Anand Doshi
|
f343a8bc75
|
remove extra buttons labelled Make Maintenance Visit
|
2012-01-19 12:41:54 +05:30 |
|
Anand Doshi
|
4b0b4a7fdc
|
Merge branch 'stable'
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:35:54 +05:30 |
|
Anand Doshi
|
5f72836f11
|
Patch to change allocated_to options to 'Profile'
|
2012-01-19 12:32:15 +05:30 |
|
Rushabh Mehta
|
94b88b9e22
|
added patch for subdomain
|
2012-01-18 10:55:39 +05:30 |
|
Anand Doshi
|
d3a23b5e8c
|
Item Manufacturer/Supplier Details in item doctype
|
2012-01-17 18:46:43 +05:30 |
|
Anand Doshi
|
a9023b1787
|
Merge branch 'stable'
|
2012-01-16 17:39:10 +05:30 |
|
Rushabh Mehta
|
cb60ca13a9
|
added patch to convert tables to utf8
|
2012-01-16 11:58:14 +05:30 |
|
Anand Doshi
|
ada0b5d554
|
Merge branch 'stable'
|
2012-01-13 13:24:53 +05:30 |
|
Anand Doshi
|
7b96d1f300
|
search_criteria patch
|
2012-01-13 11:53:22 +05:30 |
|
Anand Doshi
|
4b80a81a2e
|
Rename Search Criteria Patch
|
2012-01-13 11:14:29 +05:30 |
|
Anand Doshi
|
640955f91d
|
Patch for fixes after major production rewrite
|
2012-01-12 12:55:29 +05:30 |
|
Nabin Hait
|
a8077bdd20
|
Error fixed in patch
|
2012-01-11 17:22:54 +05:30 |
|
Nabin Hait
|
42a411398a
|
Error fixed in patches
|
2012-01-11 16:57:44 +05:30 |
|
Nabin Hait
|
55c037c250
|
Added production_cleanup patch
|
2012-01-11 16:44:07 +05:30 |
|
Nabin Hait
|
c5d6bcbb8f
|
Production module cleanup
|
2012-01-11 16:41:16 +05:30 |
|
Anand Doshi
|
bf166e487d
|
Patch to rename doctype indent
|
2012-01-10 17:06:16 +05:30 |
|
Anand Doshi
|
3a82dfd171
|
Rename Indent to Purchase Requisition
|
2012-01-10 16:56:11 +05:30 |
|
Anand Doshi
|
bc45f896f7
|
Merged master with stable
|
2012-01-10 14:11:07 +05:30 |
|
Anand Doshi
|
266829f024
|
Merge branch 'master' into stable
|
2012-01-10 13:59:14 +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 |
|
Nabin Hait
|
7394239e05
|
delete purpose of service
|
2012-01-05 12:16:28 +05:30 |
|
Nabin Hait
|
2abc6026f2
|
reload po-pr mapper
|
2012-01-05 11:24:49 +05:30 |
|
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 |
|