Anand Doshi
|
4284024acc
|
[fix] [patch] fixes bad stock entries due to a bug introduced in commit c46d044efe
|
2013-08-21 12:27:26 +05:30 |
|
Nabin Hait
|
fe14f69e71
|
[fix] [patch] [minor] sle for deleted stock entry detail
|
2013-08-20 20:06:14 +05:30 |
|
Nabin Hait
|
eb9194f66d
|
[fix] [minor] remove fix patch
|
2013-08-20 18:10:44 +05:30 |
|
Nabin Hait
|
7bd850a133
|
[patch] [minor] fix sle against cancelled stock entry for production
|
2013-08-20 17:40:26 +05:30 |
|
Nabin Hait
|
4ae729bfd2
|
[cleanup] [minor] deprecated cancelled stock ledger entry
|
2013-08-20 12:04:46 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Anand Doshi
|
b02fba9c77
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-19 20:03:51 +05:30 |
|
Anand Doshi
|
2e31e097fa
|
[fix] [minor] _round function - implement round halfs to nearest even number
|
2013-08-19 19:58:23 +05:30 |
|
Nabin Hait
|
76273ebfbc
|
[merge] [minor] Fixed conflict while merging serial_no branch with master
|
2013-08-19 16:26:13 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Nabin Hait
|
176f3afd14
|
[fix] [minor] fixes in POS Invoice print format
|
2013-08-16 16:17:34 +05:30 |
|
Rushabh Mehta
|
6e252d64aa
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-16 10:04:45 +05:30 |
|
Nabin Hait
|
f32a4643e5
|
[fix] [minor] reload shopping_cart_price_list
|
2013-08-15 14:39:12 +05:30 |
|
Nabin Hait
|
3ead4a6e08
|
[fix] [minor] reload event on birthday patch
|
2013-08-15 14:30:46 +05:30 |
|
Anand Doshi
|
894341be72
|
[fix] [minor] price list rename patch
|
2013-08-14 19:24:36 +05:30 |
|
Rushabh Mehta
|
170be3b717
|
[minor] merge master
|
2013-08-14 18:41:42 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Anand Doshi
|
0b6fa018d6
|
[fix] [minor] create birthday event only for active employees, else delete it
|
2013-08-14 10:54:16 +05:30 |
|
Anand Doshi
|
05a340e764
|
[fix] [minor] fixes after merging akhilesh's changes
|
2013-08-12 20:01:55 +05:30 |
|
Anand Doshi
|
9e59aff54e
|
Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
accounts/doctype/pos_setting/pos_setting.txt
patches/patch_list.py
|
2013-08-12 20:00:33 +05:30 |
|
Anand Doshi
|
f066f7166b
|
[minor] [fix] [patch] rename price list
|
2013-08-12 12:29:36 +05:30 |
|
Nabin Hait
|
4af2dbf84d
|
[perpetual accounting] [minor] patch for intial setup
|
2013-08-12 12:24:08 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Rushabh Mehta
|
0b9954059c
|
[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)
|
2013-08-09 15:30:11 +05:30 |
|
Akhilesh Darjee
|
44b2e23eba
|
[fix] pos settings - replace customer account with customer
|
2013-08-09 12:43:57 +05:30 |
|
Anand Doshi
|
9113f259bb
|
[fix] [minor] [patch] commit after update qty
|
2013-08-07 15:19:32 +05:30 |
|
Nabin Hait
|
8daa702a90
|
Merge branch 'master' into perpetual
|
2013-08-07 12:46:50 +05:30 |
|
Anand Doshi
|
5e4e5d78df
|
[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166
|
2013-08-06 17:23:44 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Nabin Hait
|
939b1523e9
|
[patch] perpetual accounting patch
|
2013-08-06 15:55:44 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
e79d57ca19
|
[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285
|
2013-08-02 19:31:41 +05:30 |
|
Anand Doshi
|
25647c4375
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
|
2013-07-29 13:31:00 +05:30 |
|
Nabin Hait
|
90d74d4bfa
|
[minor] sales invoice to delivery note mapping and prevdoc validation
|
2013-07-29 13:27:18 +05:30 |
|
Anand Doshi
|
ef0ab5d9aa
|
[patch] [minor] set price list currency, where only one currency is used for item price
|
2013-07-29 13:06:50 +05:30 |
|
Anand Doshi
|
86537edd10
|
[fix] [patch] [minor] custom print format net total export patch
|
2013-07-26 11:34:16 +05:30 |
|
Anand Doshi
|
2b1d33f178
|
[minor] [cleanup] [issue] webnotes/erpnext#438 - change user_type Partner to Website User
|
2013-07-25 17:17:47 +05:30 |
|
Anand Doshi
|
c30988b8a4
|
[minor] [fix] [patch] change item wise tax
|
2013-07-25 13:50:51 +05:30 |
|
Anand Doshi
|
4a352310c5
|
[minor] [fix] remove website.pyc
|
2013-07-23 17:54:16 +05:30 |
|
Anand Doshi
|
d81c320a32
|
[minor] [patch] replace doc.net_total/doc.conversion_rate with doc.net_total_export in custom print formats
|
2013-07-22 15:57:31 +05:30 |
|
Anand Doshi
|
59544ff542
|
[minor] [patch] [fix] commit after each repost in p07_repost_billed_amt_in_sales_cycle.py
|
2013-07-19 16:25:32 +05:30 |
|
Anand Doshi
|
0d009f3db0
|
[minor] [fix] [patch] cost center company
|
2013-07-19 16:11:21 +05:30 |
|
Nabin Hait
|
67e6c80437
|
[fix] [minor] validate same sales rate patch
|
2013-07-18 13:25:47 +05:30 |
|
Nabin Hait
|
60d9a5e2ee
|
[patch] repost billed amt in sales cycle, based on export amount instead of amount in base currency
|
2013-07-18 13:15:41 +05:30 |
|
Nabin Hait
|
2e652e8294
|
[fix] [minor] same sales rate throughour sales cycle
|
2013-07-18 12:30:30 +05:30 |
|
Nabin Hait
|
14f42664ec
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-18 12:28:56 +05:30 |
|
Nabin Hait
|
5b43b3dca5
|
merged with slow branch
|
2013-07-18 12:28:09 +05:30 |
|
Anand Doshi
|
4daf3dd8a8
|
[minor] [fix] reload doctype and docfield twice
|
2013-07-17 18:06:02 +05:30 |
|
Anand Doshi
|
cc04a17030
|
[minor] show brand html in toolbar
|
2013-07-17 14:15:26 +05:30 |
|
Anand Doshi
|
6537f3d25f
|
[minor] [fix] reload core doctypes before patches
|
2013-07-17 13:22:04 +05:30 |
|
Anand Doshi
|
1ba072fa9b
|
[fix] [patch] check in_list_view for Custom DocTypes
|
2013-07-17 12:41:19 +05:30 |
|
Anand Doshi
|
55da1ff98a
|
[fix] [patch] check in_list_view for Custom DocTypes
|
2013-07-17 12:36:07 +05:30 |
|
Anand Doshi
|
a1299dd652
|
[minor] fixed patch
|
2013-07-16 20:56:38 +05:30 |
|
Nabin Hait
|
6a3b951352
|
[accounts] [feature] optional checkbox for same rate validation in sales cycle
|
2013-07-16 18:34:35 +05:30 |
|
Anand Doshi
|
17aa1337bc
|
[minor] fixed patch
|
2013-07-16 15:22:55 +05:30 |
|
Anand Doshi
|
e47963305d
|
[minor] fixed patch
|
2013-07-16 15:18:18 +05:30 |
|
Anand Doshi
|
c2b9ce1def
|
[minor] fixed patch
|
2013-07-16 15:15:02 +05:30 |
|
Anand Doshi
|
526a60b517
|
[minor] fixed patch
|
2013-07-16 15:14:13 +05:30 |
|
Anand Doshi
|
447068aefe
|
[minor] fixed patch
|
2013-07-16 15:11:55 +05:30 |
|
Anand Doshi
|
2d71a51a08
|
[minor] fixed patch
|
2013-07-16 13:06:14 +05:30 |
|
Anand Doshi
|
38bef0e4c9
|
[patch] merge duplicate leads based on email id
|
2013-07-16 12:59:23 +05:30 |
|
Anand Doshi
|
9f9877a447
|
[minor] [patch] save style settings post release of responsive ui
|
2013-07-16 11:35:24 +05:30 |
|
Rushabh Mehta
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Rushabh Mehta
|
e62a85afcf
|
[patch] [minor] removed patch
|
2013-07-10 20:44:13 +05:30 |
|
Saurabh
|
86408c3d44
|
queries to server side
|
2013-07-10 14:00:37 +05:30 |
|
Anand Doshi
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +05:30 |
|
Nabin Hait
|
fd33b2b718
|
[patch] copy customer_address to shipping_address in delivery note
|
2013-07-09 11:42:38 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Anand Doshi
|
111ae7d6cd
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
|
2013-07-08 11:57:40 +05:30 |
|
Anand Doshi
|
690c2f5ffe
|
[patch] [fix] delete report
|
2013-07-08 11:55:50 +05:30 |
|
Anand Doshi
|
0f21b324c9
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
|
2013-07-08 11:53:35 +05:30 |
|
Nabin Hait
|
70eda07bcf
|
[report] deleted duplicate report
|
2013-07-08 11:33:09 +05:30 |
|
Rushabh Mehta
|
a2a1ec765b
|
[mappers] cleanup, remove dt_map, map_doclist and other such functions
|
2013-07-08 11:08:27 +05:30 |
|
Nabin Hait
|
ed23cca9d3
|
[mapper] removed old mapper from files and database
|
2013-07-07 19:11:52 +05:30 |
|
Nabin Hait
|
650501526f
|
[merge] fixed conflict
|
2013-07-07 11:38:10 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Nabin Hait
|
0c526be667
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-05 11:27:54 +05:30 |
|
Nabin Hait
|
3525481823
|
[patch] restore defaults
|
2013-07-05 11:27:26 +05:30 |
|
Nabin Hait
|
fa8d69c7ca
|
Update patch_list.py
|
2013-07-04 15:02:23 +05:30 |
|
Nabin Hait
|
bce622d723
|
Update patch_list.py
|
2013-07-04 14:40:21 +05:30 |
|
Nabin Hait
|
3f30e3132b
|
[mapper] reload
|
2013-07-04 14:36:16 +05:30 |
|
Anand Doshi
|
15db6c4659
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
buying/doctype/supplier_quotation/supplier_quotation.js
patches/patch_list.py
|
2013-07-02 11:50:32 +05:30 |
|
Nabin Hait
|
ac24d0fa98
|
[fixes] ignore single doctypes in chekcing linked documents
|
2013-07-01 14:03:08 +05:30 |
|
Anand Doshi
|
971f30a12b
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-28 19:19:04 +05:30 |
|
Anand Doshi
|
8f9f8a43c7
|
[lead] [address] store lead address in Address doctype, with link field=lead
|
2013-06-28 19:18:33 +05:30 |
|
Rushabh Mehta
|
03e9a4ea11
|
[company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller
|
2013-06-28 12:49:28 +05:30 |
|
Anand Doshi
|
70902da4da
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/december_2012/deprecate_tds.py
patches/june_2012/reports_list_permission.py
selling/doctype/sales_bom/locale/_messages_doc.json
selling/doctype/sales_bom/locale/ar-doc.json
selling/doctype/sales_bom/locale/de-doc.json
selling/doctype/sales_bom/locale/es-doc.json
selling/doctype/sales_bom/locale/fr-doc.json
selling/doctype/sales_bom/locale/hi-doc.json
selling/doctype/sales_bom/locale/hr-doc.json
selling/doctype/sales_bom/locale/nl-doc.json
selling/doctype/sales_bom/locale/pt-BR-doc.json
selling/doctype/sales_bom/locale/pt-doc.json
selling/doctype/sales_bom/locale/sr-doc.json
selling/doctype/sales_bom/locale/ta-doc.json
selling/doctype/sales_bom/locale/th-doc.json
selling/doctype/sales_bom_item/locale/_messages_doc.json
selling/doctype/sales_bom_item/locale/ar-doc.json
selling/doctype/sales_bom_item/locale/de-doc.json
selling/doctype/sales_bom_item/locale/es-doc.json
selling/doctype/sales_bom_item/locale/fr-doc.json
selling/doctype/sales_bom_item/locale/hi-doc.json
selling/doctype/sales_bom_item/locale/hr-doc.json
selling/doctype/sales_bom_item/locale/nl-doc.json
selling/doctype/sales_bom_item/locale/pt-BR-doc.json
selling/doctype/sales_bom_item/locale/pt-doc.json
selling/doctype/sales_bom_item/locale/sr-doc.json
selling/doctype/sales_bom_item/locale/ta-doc.json
selling/doctype/sales_bom_item/locale/th-doc.json
|
2013-06-26 14:07:29 +05:30 |
|
Nabin Hait
|
50899d2bd4
|
[fix][patch] bom exploded items
|
2013-06-25 15:17:38 +05:30 |
|
Nabin Hait
|
ec1f69ddb9
|
[reports][fix] removed old reports
|
2013-06-25 12:17:43 +05:30 |
|
Rushabh Mehta
|
664ba4001f
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-25 11:46:24 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Nabin Hait
|
4d150e67e6
|
[patch] reload sales partner for webpage
|
2013-06-25 11:05:17 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Saurabh
|
85cbe16f52
|
[patch] reload sales partner for webpage
|
2013-06-24 15:16:50 +05:30 |
|
Saurabh
|
7b4bbbd6bd
|
[reload doctype and page]
|
2013-06-24 15:00:21 +05:30 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Saurabh
|
7bfb2b6814
|
Merge branch 'responsive' of https://github.com/webnotes/erpnext into responsive
|
2013-06-24 14:10:36 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Nabin Hait
|
f78d16cca1
|
[general ledger] group by voucher option
|
2013-06-21 15:13:49 +05:30 |
|
Anand Doshi
|
b5fd788131
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-17 12:55:05 +05:30 |
|
Anand Doshi
|
11d311376e
|
[event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue
|
2013-06-17 12:51:36 +05:30 |
|
Anand Doshi
|
a2e2d4bd19
|
[price list] [fix] fix in buying selling price list patch
|
2013-06-12 17:44:10 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Rushabh Mehta
|
a642d59cfd
|
[patch] [cleanup] drop unused tables
|
2013-06-11 17:32:48 +05:30 |
|
Rushabh Mehta
|
1894709aa3
|
[patch] [cleanup] remove unused doctypes
|
2013-06-11 17:08:16 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
a40c60ea3e
|
[cleanup] removed Trash Control, SMS Receiver, Profile Control, GL Mapper, GL Mapper Detail
|
2013-06-11 10:43:00 +05:30 |
|
Anand Doshi
|
097ac352d6
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:38:31 +05:30 |
|
Anand Doshi
|
670199b9c6
|
[patch] [fix] event for project, oppty, lead
|
2013-06-10 15:38:01 +05:30 |
|
Anand Doshi
|
83ce95932a
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:28:40 +05:30 |
|
Anand Doshi
|
dec9a165ac
|
[patch] [fix] events for project, lead, oppty
|
2013-06-10 15:26:54 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Anand Doshi
|
e53a81dcea
|
[event] [lead, opportunity, project] [fix] create events
|
2013-06-10 15:15:40 +05:30 |
|
Anand Doshi
|
6e6fb42906
|
[projects] [patch] fixed project completed patch
|
2013-06-07 15:55:31 +05:30 |
|
Rushabh Mehta
|
224ad17b1d
|
[profile] removed themes
|
2013-06-07 15:09:45 +05:30 |
|
Rushabh Mehta
|
cdd265d3bf
|
[project] added patch
|
2013-06-07 14:52:53 +05:30 |
|
Anand Doshi
|
e3e15a94c3
|
[system console] [security fix] removed system console
|
2013-06-06 11:35:49 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
90202aec2b
|
[merge conflict]
|
2013-06-05 12:37:10 +05:30 |
|
Nabin Hait
|
aec5553814
|
bom exploded items grouped by items
|
2013-06-04 17:20:47 +05:30 |
|
Nabin Hait
|
8d7310ac5f
|
bom exploded items grouped by items
|
2013-06-04 17:11:43 +05:30 |
|
Nabin Hait
|
89ab4719ff
|
bom exploded items grouped by items
|
2013-06-04 17:07:57 +05:30 |
|
Nabin Hait
|
ad600cce22
|
bom exploded items grouped by items
|
2013-06-04 16:56:56 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
Anand Doshi
|
c7b8c4a414
|
[move update stock to pos] set update_stock = 0 in old sales invoice where is_pos = 0
|
2013-05-31 16:31:44 +05:30 |
|
Anand Doshi
|
74a62b17f4
|
[update file data 2 patch] [fix] auto commit on many writes for the duration of the patch
|
2013-05-30 23:49:00 +05:30 |
|
Anand Doshi
|
b68fbf0532
|
[update file size patch] [fix] auto commit on many writes for the duration of the patch
|
2013-05-30 23:39:24 +05:30 |
|
Anand Doshi
|
f41ce11e91
|
[taxes and charges] [item wise tax detail] patch to store this as json
|
2013-05-30 19:18:51 +05:30 |
|
Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Rushabh Mehta
|
c6f890f892
|
[merge]
|
2013-05-29 13:19:27 +05:30 |
|
Anand Doshi
|
047442efa2
|
[notes] [fix] fix in note patch
|
2013-05-29 11:07:11 +05:30 |
|
Rushabh Mehta
|
f32ee3c28e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-05-29 11:07:05 +05:30 |
|
Rushabh Mehta
|
67d1afa481
|
[grid] allow section breaks and relayout grid
|
2013-05-29 11:06:03 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Rushabh Mehta
|
6986fc7ff3
|
[comment] fix creation, deltion, close #131
|
2013-05-28 13:09:23 +05:30 |
|
Rushabh Mehta
|
74560b32c1
|
[website] updates for bootstrap3
|
2013-05-27 14:47:56 +05:30 |
|
Anand Doshi
|
5dfba486a6
|
[note] [fix] strip invalid characters from title and set it as the name of the note
|
2013-05-27 12:25:28 +05:30 |
|
Anand Doshi
|
149b461e62
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
|
2013-05-24 19:28:36 +05:30 |
|
Rushabh Mehta
|
b4a2949c37
|
[knowledge base] removed and added patch to move to notes
|
2013-05-24 16:33:21 +05:30 |
|
Rushabh Mehta
|
9c5f4fe165
|
[knowledge base] removed and added patch to move to notes
|
2013-05-24 16:33:10 +05:30 |
|
Nabin Hait
|
b56412c646
|
[fixes][aii] cancelled gl entry for delivery note and patch
|
2013-05-23 17:41:52 +05:30 |
|
Anand Doshi
|
4543884021
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
|
2013-05-23 15:22:47 +05:30 |
|
Nabin Hait
|
62d0629d61
|
[feature] reorder level checking through scheduler
|
2013-05-22 16:19:10 +05:30 |
|
Anand Doshi
|
ace9cbad9e
|
[support] [fix] [patch] reload support ticket and communication before the patch
|
2013-05-22 12:22:29 +05:30 |
|
Anand Doshi
|
5be11b44ac
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
controllers/buying_controller.py
|
2013-05-21 19:40:09 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Nabin Hait
|
cb99045764
|
[patch] update lead, contact in support ticket
|
2013-05-21 17:17:40 +05:30 |
|
Nabin Hait
|
f8525fea06
|
[fixes][patch] update valuation rate in purchase cycle and repost patch
|
2013-05-20 15:30:02 +05:30 |
|
Nabin Hait
|
9053cbc9f8
|
[fixes][patch] update valuation rate in purchase cycle and repost patch
|
2013-05-20 15:28:44 +05:30 |
|
Nabin Hait
|
031b7b3069
|
[fixes] repost stock: commit after every 20
|
2013-05-20 12:19:57 +05:30 |
|
Anand Doshi
|
b5aa8da0dd
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
|
2013-05-17 15:12:49 +05:30 |
|
Anand Doshi
|
48787e944e
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-17 15:10:57 +05:30 |
|
Nabin Hait
|
d37ac68f1b
|
[fixes] fixes in patch
|
2013-05-17 13:17:01 +05:30 |
|
Nabin Hait
|
8f78bec5b8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-17 12:49:36 +05:30 |
|
Nabin Hait
|
b9669de3ff
|
[patch] repost_stock: commit after every 50
|
2013-05-17 12:21:13 +05:30 |
|
Nabin Hait
|
f826b93a75
|
[patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch
|
2013-05-17 12:19:50 +05:30 |
|
Anand Doshi
|
44a01faff9
|
[patches] [fix] fixed an old patch
|
2013-05-16 16:17:15 +05:30 |
|
Anand Doshi
|
27ff675a07
|
[patches] [fix] fixed an old patch
|
2013-05-16 16:15:19 +05:30 |
|
Anand Doshi
|
9a22e3f1db
|
[patches] [fix] fixed an old patch
|
2013-05-16 16:13:16 +05:30 |
|
Anand Doshi
|
cae99dbf71
|
[patches] [fix] fixed an old patch
|
2013-05-16 15:57:45 +05:30 |
|
Anand Doshi
|
6e0e1c8fcc
|
[patches] [fix] fixed an old patch
|
2013-05-16 15:46:32 +05:30 |
|
Anand Doshi
|
101877276e
|
[patches] [fix] fixed an old patch
|
2013-05-16 15:45:06 +05:30 |
|
Anand Doshi
|
71c265dee8
|
[patches] [fix] fix in old patch
|
2013-05-16 15:42:56 +05:30 |
|
Anand Doshi
|
6febab9f92
|
[patches] [fix] fix in an old patch
|
2013-05-16 15:40:07 +05:30 |
|
Anand Doshi
|
c852596f15
|
[patches] [fix] removed purchase request reload
|
2013-05-16 15:37:36 +05:30 |
|
Anand Doshi
|
1d4b5b4ca6
|
[patches] [fix] removed blog reload
|
2013-05-16 15:35:08 +05:30 |
|
Anand Doshi
|
4221814131
|
[patches] [fix] replace sync with reload_doc in old patches
|
2013-05-16 15:28:19 +05:30 |
|
Anand Doshi
|
0eef6e9e42
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/patch_list.py
|
2013-05-15 21:18:27 +05:30 |
|
Anand Doshi
|
21f4ea36b2
|
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
|
2013-05-10 18:08:32 +05:30 |
|
Nabin Hait
|
4e1dcfc561
|
[patch] repost stock for no posting date
|
2013-05-10 15:17:20 +05:30 |
|
Anand Doshi
|
3f9366bb6c
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-06 12:07:30 +05:30 |
|
Anand Doshi
|
0382d5a01d
|
[patch] [fix] reload print format doctype
|
2013-05-02 16:42:26 +05:30 |
|
Anand Doshi
|
8323b6da45
|
[patch] [fix] reload print format doctype
|
2013-05-02 16:41:20 +05:30 |
|
Anand Doshi
|
ff1e155a77
|
[price list] country-wise price list
|
2013-05-02 16:25:59 +05:30 |
|
Anand Doshi
|
447008b045
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-01 14:48:16 +05:30 |
|
Anand Doshi
|
d7ad13a8a7
|
[price list] [country] specify country for a price list
|
2013-04-29 19:38:34 +05:30 |
|
Anand Doshi
|
fe5fb33cc2
|
[patch] [file data] fix
|
2013-04-29 15:27:57 +05:30 |
|
Anand Doshi
|
28eae6e9ff
|
[patch] [file data] fix
|
2013-04-29 15:25:52 +05:30 |
|
Anand Doshi
|
bbc6cfac25
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
|
2013-04-29 15:23:30 +05:30 |
|
Anand Doshi
|
eda17eb20a
|
[patch] [fiel data] new patch p07_update_file_data_2
|
2013-04-29 15:21:30 +05:30 |
|
Nabin Hait
|
7b596d8d88
|
fixed conflict
|
2013-04-29 14:37:38 +05:30 |
|
Nabin Hait
|
345c8fbfa2
|
[patch] rebuild sales browser
|
2013-04-29 14:35:11 +05:30 |
|
Anand Doshi
|
7bd7c8769e
|
[patch] [file data] files in update file data patch
|
2013-04-29 14:22:04 +05:30 |
|
Anand Doshi
|
123f59dc89
|
[patches] [file data] fixes in file data patch
|
2013-04-29 14:21:42 +05:30 |
|
Anand Doshi
|
e5a36a287f
|
[patch] [file data] patch for custom fields with name file_list
|
2013-04-29 14:12:27 +05:30 |
|
Anand Doshi
|
4cbeda1ec7
|
[patch] [fix] commented out export_to_files call in p05_update_file_data patch
|
2013-04-29 10:48:45 +05:30 |
|
Rushabh Mehta
|
cdc9e2cd6f
|
[patch] [file data] reset permissions
|
2013-04-25 11:06:17 +05:30 |
|
Anand Doshi
|
a5d19955d1
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 11:48:28 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Anand Doshi
|
978dc8b74d
|
[patches] [fix] fix in update_account_property_patch
|
2013-04-22 14:25:06 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Anand Doshi
|
c54bbc039f
|
[patch] [fix] reload Delivery Note Item before default cost center patch
|
2013-04-19 16:41:57 +05:30 |
|
Anand Doshi
|
9b826a7cb2
|
[patches] removed export file from update file data patch
|
2013-04-19 16:30:32 +05:30 |
|
Anand Doshi
|
aeef7bd910
|
[sales taxes and charges] renamed field cost_center_other_charges to cost_center
|
2013-04-19 16:21:55 +05:30 |
|
Anand Doshi
|
90dad5c5b5
|
Merge branch 'master' into edge
|
2013-04-19 11:43:16 +05:30 |
|
Anand Doshi
|
4d705590b7
|
[patch] [default cost center] defaults starting with colon like :Company should not be a part of database default spec
|
2013-04-18 16:21:42 +05:30 |
|
Nabin Hait
|
9a2dff6675
|
packing slip refactored
|
2013-04-17 17:21:31 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|