Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,219 Commits 3 Branches 0 Tags 1 GiB
6d1dbd6384
Commit Graph

1099 Commits

Author SHA1 Message Date
Rushabh Mehta
46e03eadca [rename] Customer Issue -> Warranty Claim 2015-02-17 10:45:50 +05:30
Nabin Hait
031303d719 Replace renamed fields in custom script and custom print formats 2015-02-12 11:48:50 +05:30
Nabin Hait
56e6ad2112 Patch for renamed total fields 2015-02-12 11:48:20 +05:30
Nabin Hait
8fa503e177 Fixed conflict while merging v4 into v5 2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Anand Doshi
dd942bb3d2 [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists 2015-02-04 18:53:24 +05:30
Rushabh Mehta
b736443e3f [patch] [fix] 2015-02-04 10:40:02 +05:30
Neil Trini Lasrado
7dac750ffe patch fix 2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
41acbff959 item name added to BOM 2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
dc65dc3778 rename patch 2015-01-27 12:27:10 +05:30
Neil Trini Lasrado
81b98261ae patch fix 2015-01-27 11:28:56 +05:30
Neil Trini Lasrado
40a9f6f8e9 patch fix 2015-01-23 15:32:35 +05:30
Neil Trini Lasrado
f0b0464cce patch for is_batch_item 2015-01-23 15:32:35 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Nabin Hait
3f671ea60f Landed Cost Voucher: Add field and fixed reposting issue 2015-01-21 14:08:06 +05:30
Anand Doshi
938ed1a57d [minor] fixed patch update_companywise_payment_account 2015-01-19 16:20:26 +05:30
Nabin Hait
9ef2e78905 Merge pull request #2553 from neilLasrado/mode-of-payment 
mode of payment - company wise default account added
 2015-01-19 14:26:00 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
f2b1f2658d patch fix 2015-01-14 12:06:20 +05:30
Neil Trini Lasrado
bd2ac2f51f mode of payment - company wise default account added 2015-01-14 12:00:17 +05:30
Nabin Hait
f34c96bf7a minor fix 2015-01-14 11:49:04 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +05:30
Nabin Hait
ebc4ae7892 patch fixes 2015-01-02 12:46:49 +05:30
Nabin Hait
56ac3fb29d some fixes for renaming patch 2015-01-01 13:40:54 +05:30
Nabin Hait
cbdfb767a9 patch fix 2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Nabin Hait
2eed5a35e3 fixed capacilty planning patch 2014-12-24 10:41:55 +05:30
Nabin Hait
57595cf73b fixed merge conflict 2014-12-23 18:05:13 +05:30
Nabin Hait
89c52eacc7 Actual operation cost in stock entry, fixed cost removed from bom and workstation 2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61 capacity planning fixes and cleanup 2014-12-23 17:39:00 +05:30
Pratik Vyas
0a726e2335 add reload doc to patch 2014-12-18 12:41:09 +05:30
Pratik Vyas
387e1e21cb add reload_doc in a few patches 2014-12-18 11:36:23 +05:30
Neil Trini Lasrado
1d66b71464 patch fix 2014-12-12 14:48:30 +05:30
Neil Trini Lasrado
8d34417c44 Bom currency feilds changed to type currency and company feild added to BOM 2014-12-12 11:33:50 +05:30
Nabin Hait
4b83403a63 Fixed bom patch 2014-12-12 11:28:58 +05:30
Neil Trini Lasrado
6ddc487fb6 patch fix 2014-12-11 17:33:41 +05:30
Neil Trini Lasrado
3a34cadcb2 Fix - Total Fixed Cost with patch 2014-12-11 17:15:12 +05:30
Rushabh Mehta
9f32a50379 [merge] fix 2014-12-03 12:35:19 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
1caa1a3708 Fixed party model patch 2014-11-28 11:26:35 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Pratik Vyas
85a354f2fb fix Mailbox migration patch 2014-11-20 11:41:30 +05:30
Nabin Hait
a6a70a5f35 Make email account patch 2014-11-12 17:00:42 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
5086ef2499 Update update_requested_and_ordered_qty.py 2014-11-05 12:33:29 +05:30
Nabin Hait
9114c26857 Patch to recalculate requested qty and ordered qty for all items 2014-11-04 15:34:03 +05:30
Nabin Hait
98050e7646 default receivable / payable accounts in company 2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba Add default party accounts in customer/supplier 2014-11-03 15:46:15 +05:30
Rushabh Mehta
3daa49ac1f [shopping-cart] i'm back 2014-10-21 16:16:30 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
2348a5f592 repost stock utility 2014-10-15 15:31:33 +05:30
Nabin Hait
b2f32dac1b Minor fix 2014-10-15 14:42:18 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Neil Trini Lasrado
c40451ee2e Patch Fixed 2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185 Fix - BOM calculated wrong cost on update cost 2014-10-14 12:14:38 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
Pratik Vyas
e435592d64 [minor] Fix default website style patch (reload doc) 2014-10-09 11:22:12 +05:30
Nabin Hait
bd1c8aff8e Deleted customer/supplier account head report 2014-10-06 13:14:02 +05:30
Nabin Hait
8f44f03cba Party model patch 
- Create receivable / payable account, set them in company
	- Set party in JV and GL Entry
	- Delete all exisintg individual party account
 2014-10-06 13:13:27 +05:30
Nabin Hait
be8ec39678 Deleted master_type, master_name, credit_days, credit_limit fields from account 
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
 2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Neil Trini Lasrado
3a19a71262 patch fixed 2014-09-30 14:48:38 +05:30
Neil Trini Lasrado
29d1a1c593 manufacturing and repack sepreted, test cases fixed, patch fixed 2014-09-30 14:07:56 +05:30
ankitjavalkarwork
44d42ddf63 [fix] Merge permission roles to modify frozen entries/set frozen accounts 2014-09-30 10:40:39 +05:30
Nabin Hait
82d7c0c9eb Patch: Fix gl entries for stock transactions 2014-09-29 15:07:51 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
Nabin Hait
3f4885e342 repost stock reconciliation 2014-09-02 20:02:24 +05:30
ankitjavalkarwork
aaac7c17b8 Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
28a975dd32 Add patch for field name change in SI, rename email template 2014-09-01 16:22:56 +05:30
Anand Doshi
98eacdb785 [patch] Set company's country 2014-09-01 10:23:47 +05:30
Rushabh Mehta
52f04da5f5 [style] default website 2014-08-25 15:17:20 +05:30
Pratik Vyas
3de7757ba4 Update update_project_milestones.py 2014-08-08 14:49:53 +05:30
Anand Doshi
6b8145a813 [patch] Add currency Turkish Lira 2014-08-08 14:05:01 +05:30
Rushabh Mehta
c9bd3f5d4a added templates for projects 2014-08-08 11:56:32 +05:30
Nabin Hait
d91cefb23d Update fix_account_master_type.py 2014-08-07 19:22:02 +05:30
Nabin Hait
05b56d0d08 Fix account's master type 2014-08-07 15:03:41 +05:30
Pratik Vyas
b91079676d [patch] remove reloading of removed print formats 2014-07-31 14:31:58 +05:30
Anand Doshi
bc708ee4c2 [print] Disable rounded total 2014-07-29 22:24:31 +05:30
Anand Doshi
bd748bd115 [hotfix] [patch] Delete old print formats 2014-07-29 08:51:41 +05:30
Rushabh Mehta
781ddc3a25 added patch to remove old print formats 2014-07-25 13:02:28 +05:30
Anand Doshi
8adb211216 Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py 2014-07-09 11:09:53 +05:30
nabinhait
6c40079139 Update delivery and billing status in SO 2014-07-07 18:02:53 +05:30
nabinhait
2c0c66e756 Update delivery and billing status in SO 2014-07-07 17:56:25 +05:30
Rushabh Mehta
58692fe4d1 sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment 2014-07-07 12:29:43 +05:30
Rushabh Mehta
5f42276dbd added patch for fixing sales order delivered qty 2014-07-01 18:42:59 +05:30
Anand Doshi
bc71f737b8 Fix JV Remarks 2014-07-01 18:12:26 +05:30
Anand Doshi
02cb347ac7 Fix comments after naming series records rename 2014-06-30 17:05:51 +05:30
Anand Doshi
5ba7ab0fed Outgoing Mail Footer patch 2014-06-27 21:00:51 +05:30
Anand Doshi
a1be6021c4 Fix in pricing rule patch 2014-06-24 15:26:40 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Nabin Hait
1d37698d4c Reload pricing rule in patch 2014-06-20 16:30:44 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Nabin Hait
91090042d1 Patch: update users report view settings for rename fields 2014-06-18 10:29:53 +05:30
Anand Doshi
e35841a2ea Reload Shopping Cart Settings in create price list patch 2014-06-16 12:59:54 +05:30
Anand Doshi
3474c273a5 Ignore mandatory in employee patch 2014-06-16 12:14:21 +05:30
Anand Doshi
3dc722b096 Create price list only if setup complete 2014-06-13 15:30:38 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Anand Doshi
27e295a4cb Merge pull request #1789 from nabinhait/v4-hotfix 
V4 hotfix
 2014-06-12 15:39:58 +05:30
Anand Doshi
3761ff3522 Fix in patch: split email settings 2014-06-12 15:00:52 +05:30
Nabin Hait
e7f2d3179d update other_charges in custom print formats 2014-06-12 14:58:09 +05:30
Anand Doshi
82029be6f9 Reload sales taxes and charges in patch 2014-06-10 14:52:49 +05:30
Nabin Hait
6febfca5a6 changed insert after for india related custom fields 2014-06-10 11:21:38 +05:30
Nabin Hait
91016ba989 update custom print formats for renamed fields 2014-06-10 10:41:37 +05:30
Anand Doshi
c01db5fe9c Save default letterhead 2014-06-09 18:01:14 +05:30
Nabin Hait
d532d2f64f create custom fields for india specific fields 2014-06-09 16:00:49 +05:30
Anand Doshi
af63d053b1 Also save Global Defaults in System Settings patch 2014-06-09 15:51:12 +05:30
Anand Doshi
be3f914acd Fixed add address template 2014-06-09 15:18:45 +05:30
Anand Doshi
390efdc884 Fix in HR patch 2014-06-09 15:04:00 +05:30
Nabin Hait
b63e99eb43 Update tax amount after discount in existing documents 2014-06-09 12:49:09 +05:30
Anand Doshi
6f561aa846 Fixed HR patch 2014-06-06 22:10:18 +05:30
Anand Doshi
0aa125304d Fixed Reset Permissions patch 2014-06-06 20:39:21 +05:30
Anand Doshi
cd0aed993a Fixed Address Template Patch 2014-06-06 17:37:31 +05:30
Anand Doshi
fc601659f5 Fixed Address Template 2014-06-06 17:07:50 +05:30
Anand Doshi
4a069a1e7f Changed case in modules.txt 2014-06-06 16:28:03 +05:30
Anand Doshi
171c00cfd6 Reload permissions for master and setting documents 2014-06-06 15:13:20 +05:30
Anand Doshi
ede8ea52b0 Fixes 2014-06-05 18:06:20 +05:30
Anand Doshi
4022586015 Update new_address_template.py 2014-06-05 17:34:59 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Anand Doshi
38dedf402b Fixes in patches for migration 2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9 Fixes in user permissions patches 2014-06-04 17:48:56 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Pratik Vyas
76e48b5c3f hotfix: update_account_root_type.py patch 2014-05-28 15:22:34 +05:30
Anand Doshi
c57d7dea8b Fixed global_defaults_to_system_settings 2014-05-22 11:05:46 +05:30
Nabin Hait
d811303d7b minor fix 2014-05-21 12:36:43 +05:30
Nabin Hait
27b12ef1b6 update account root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
dec02340e8 reload account doc in root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
3f80ef0648 reload account doc in root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
0e6554edc1 Root Type field added in account and patch for existing accoutns 2014-05-21 11:53:58 +05:30
Nabin Hait
a220e5d850 Update global_defaults_to_system_settings.py 2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9 Update global_defaults_to_system_settings.py 2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc Update global_defaults_to_system_settings.py 2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac Update global_defaults_to_system_settings.py 2014-05-15 18:18:32 +05:30
Nabin Hait
9419575126 Merged language patch with global_defaults_to_system_settings patch 2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a Global Defaults to system settings. Fixes #1653 2014-05-15 16:42:23 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Pratik Vyas
6e686224eb fix patches 2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc fix update user properties patch 2014-05-10 22:16:39 +05:30
Pratik Vyas
34e36a233c Patch changes for 3 to 4 migration 2014-05-09 12:01:25 +05:30
Anand Doshi
4b7a6b13ec Additions to remove India specific fields 2014-05-06 16:41:31 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Anand Doshi
91b451b8ce Updated validate v3 patch 2014-05-05 18:25:37 +05:30
Nabin Hait
985918d42b Minor fixes in company and account 2014-04-28 17:08:28 +05:30
Nabin Hait
6298536e46 set stock balance as per serial no count 
Cherry Picked and Modified by @anandpdoshi

Conflicts:
	stock/doctype/stock_ledger/stock_ledger.py
	utilities/repost_stock.py
 2014-04-16 15:23:08 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Nabin Hait
2c517e0a62 Fixes related to countrywise coa 2014-03-25 18:28:49 +05:30
Nabin Hait
ec9fb67d84 fixed conflict 2014-03-25 16:53:50 +05:30
Anand Doshi
7fbdba02ab Fixed Countrywise Chart of Accounts patch 2014-03-25 13:50:52 +05:30
Nabin Hait
221a8fff1c minor fix in patch 2014-03-23 17:35:24 +05:30
Nabin Hait
155c96b410 patch to delete mis control and financial statements and set bank/cash account 2014-03-21 12:15:13 +05:30
Nabin Hait
47a3c10334 Patch to update old accounts property 2014-03-21 11:26:08 +05:30
Nabin Hait
037bf6b382 More country charts imported from openerp 2014-03-21 11:25:17 +05:30
Nabin Hait
24e136e3f3 Patch: set root_type for old existing accounts 2014-03-21 11:25:16 +05:30
Nabin Hait
b93ebaebe4 Added new account types and patch for existing 2014-03-21 11:22:41 +05:30
Nabin Hait
a69c30edec country code added 2014-03-21 11:22:39 +05:30
Nabin Hait
53822ae9d0 Account balance must be of type debit/credit 2014-03-21 11:22:38 +05:30
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec Fixed Dropbox, Scheduler, 3to4 migration 2014-03-11 15:17:13 +05:30
Anand Doshi
ebdac5db5c Fix in Pricing Rule Patch 2014-03-05 17:31:37 +05:30
Anand Doshi
74d0e40bdc Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields 2014-03-05 15:24:29 +05:30
Anand Doshi
e30511d315 Email Settings split into Outgoing Email Settings and Support Email Settings 2014-03-03 20:32:20 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Nabin Hait
f976143063 pricing rule patch fix 2014-02-28 19:02:27 +05:30
Nabin Hait
311079a311 Patch: copy customer discount to pricing rule 2014-02-28 13:04:19 +05:30
Rushabh Mehta
063141d152 added patch for address 2014-02-28 11:37:36 +05:30
Anand Doshi
fb21ce3893 3to4 fixes 2014-02-27 13:18:20 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd Fixed Purchase Invoice test cases 2014-02-25 17:25:28 +05:30
Rushabh Mehta
a6628eee56 rename sitemap to route 2014-02-25 11:08:37 +05:30
Pratik Vyas
da0a23e635 remove print in patch, booboo 2014-02-17 14:56:00 +05:30
Pratik Vyas
31affc0e67 bump modified dates for purchase receipt and purchase invoice 2014-02-17 11:36:10 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
eba1bdbcca minor fixes 2014-02-12 16:04:17 +05:30
Nabin Hait
139dc7b9b2 minor fixes 2014-02-12 14:54:16 +05:30
Nabin Hait
5f59726903 Rename fields: replaced in html and txt files 2014-02-12 14:54:15 +05:30
Nabin Hait
777397489e Fields renamed in schema 2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102 commonify get_item_details and rename fields to sync selling and purchase 2014-02-12 14:54:12 +05:30
Anand Doshi
7bb9c3f125 Nested Set Test using Test Item group 2014-02-06 17:51:18 +05:30
Nabin Hait
574c7e7c63 item related cleanup 2014-02-06 15:51:01 +05:30
Nabin Hait
dfae0ea570 minor fix in patch 2014-01-31 17:25:09 +05:30
Akhilesh Darjee
e0a1039756 merge conflict fixed 2014-01-30 14:44:35 +05:30
Akhilesh Darjee
4cdb79941b map charge to taxes and charges in transactions 2014-01-30 13:56:57 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
 2014-01-24 21:44:36 +05:30
Rushabh Mehta
1cd96a136f updates for restriction 2014-01-24 11:10:24 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
5dd92fd5d6 reload doc in maintenance schedule 2014-01-03 19:14:01 +05:30
Akhilesh Darjee
e27717261d merge conflict fixed 2014-01-03 18:18:31 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Akhilesh Darjee
829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount 2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c Merge fixes: removed patches, removed Warehouse User 2013-12-27 18:00:28 +05:30
Rushabh Mehta
61bf425935 deleted moves 2013-12-27 17:58:39 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef Moved demo to separate app, moved patches folder 2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8 Moved patches and fixed method routing in pages 2013-12-27 13:43:40 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
caa4380d49 Merge with 3.3.8 2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Nabin Hait
de7fcc66df updated repost_stock patch 2012-09-24 15:53:01 +05:30
Nabin Hait
9ed7b8bb75 fixed conflict 2012-09-24 15:46:55 +05:30
Nabin Hait
6e6dd1b0d5 reload gross profit report 2012-09-24 15:45:02 +05:30
Anand Doshi
5f76ceb38e Delete permission for Event doctype to System Manager 2012-09-24 15:41:41 +05:30
Anand Doshi
9ef7bd8494 Delete permission for Event doctype to System Manager 2012-09-24 15:41:27 +05:30
Nabin Hait
e4e88c9715 repost_stock patch and gross profit report 2012-09-24 15:40:56 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Anand Doshi
86096ff0b4 syntax error fix 2012-09-19 12:23:35 +05:30
Rushabh Mehta
823c021e9c added index patch and updated general_ledger 2012-09-19 12:01:01 +05:30
Anand Doshi
05f1d45600 removed unicode literals from patch list 2012-09-18 14:04:22 +05:30
Nabin Hait
9a90c89b3f removed duplicate function from sales invoice 2012-09-18 13:37:27 +05:30
Anand Doshi
8263419691 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:35:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Anand Doshi
21e8447e6c Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 12:04:30 +05:30
Anand Doshi
20d82800f3 add delete permission to communication 2012-09-10 12:03:31 +05:30
Anand Doshi
88411eddb8 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-10 11:32:17 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
 2012-09-10 11:31:18 +05:30
Anand Doshi
38ab4ae3ac add stock report permission for accounts manager 2012-09-10 11:23:51 +05:30
Rushabh Mehta
93af75a160 added unicode literals in patch 2012-09-07 10:57:14 +02:00
Nabin Hait
ea4e6b0f0c reload stock ledger report 2012-09-07 12:15:29 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
518090f38e autocommit for repost stock due to wrong packing list patch 2012-09-05 13:26:53 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
 2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772 removed cash flow statement 2012-08-31 11:01:21 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
26da576f1e patch list updated 2012-08-29 12:09:35 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Anand Doshi
d297b88f60 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/patches/patch_list.py
 2012-08-23 15:26:38 +05:30
Anand Doshi
6db2ac51e6 changed blog comments date format to global date format i.e. 1 January 2012 2012-08-23 15:24:21 +05:30
Nabin Hait
22aa31ead2 updated profile permission 2012-08-13 13:15:36 +05:30
Rushabh Mehta
0f0d8850d0 merged with master (project cleanup) 2012-08-08 14:28:24 +05:30
Rushabh Mehta
2937e7e842 task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic) 2012-08-08 12:54:47 +05:30
Anand Doshi
ebcb3c02d0 fixes in supplier quotations report patch 2012-08-07 15:24:46 +05:30
Anand Doshi
4e2feb2b28 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-07 15:14:07 +05:30
Anand Doshi
883285f503 fix in supplier quotations patch 2012-08-07 15:13:48 +05:30
Anand Doshi
e81c07ff4d appended unicode literals import after merge 2012-08-07 15:08:52 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/stock/doctype/item/item.txt
 2012-08-07 15:07:56 +05:30
Anand Doshi
e30d5f833e New Report: Supplier Quotations 2012-08-07 15:05:42 +05:30
Anand Doshi
a742d32c96 added unicode literals import to supplier quotation patch 2012-08-06 20:03:49 +05:30
Anand Doshi
0d0efcfd14 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-06 19:56:03 +05:30
Anand Doshi
b8219aa4f0 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
	public/js/fields.js
 2012-08-06 19:55:43 +05:30
Anand Doshi
8ce2ac3f0e supplier quotation release patch 2012-08-06 19:53:31 +05:30
Nabin Hait
ed8049ec19 fixes in patch: considered over delivery in reserved qty calculation 2012-08-06 14:31:45 +05:30
Anand Doshi
e64d900322 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
 2012-08-06 13:23:16 +05:30
Anand Doshi
326f88cce6 fixed patch: repost stock due to wrong packing list 2012-08-03 19:19:23 +05:30
Anand Doshi
fea3b64dd0 fixed patch: repost stock due to wrong packing list 2012-08-03 19:14:42 +05:30
Anand Doshi
df902d1a0c patch: repost stock due to wrong packing list entries - optimized query using index and subqueries 2012-08-03 19:11:11 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Nabin Hait
175771c699 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 08:40:14 +05:30
Nabin Hait
8292691470 stock repost patch 2012-08-03 08:39:17 +05:30
Anand Doshi
a67a74fee1 supplier quotation, project shift patch 2012-08-02 18:53:00 +05:30
Nabin Hait
dd9d4bbdea repost stock patch due to wrong packing list 2012-08-02 10:56:40 +05:30
Anand Doshi
59d37c4bcb Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py
 2012-07-31 17:30:49 +05:30
Nabin Hait
8d97290c06 updated bin permission 2012-07-31 14:12:23 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
 2012-07-27 14:45:24 +05:30
Anand Doshi
b3a4c09e07 added guest read permission to blog 2012-07-27 14:39:27 +05:30
Anand Doshi
66f90687e9 import unicode_literals where missing 2012-07-27 14:29:29 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Anand Doshi
9b8fca9d75 new patches for unicode release 2012-07-23 13:10:33 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Nabin Hait
28115f3373 repost stock due to incorrect packing list 2012-07-18 18:29:05 +05:30
Nabin Hait
ddb9f948ee repost stock due to incorrect packing list 2012-07-18 18:12:34 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77 fix in syntax of owner match patch 2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Rushabh Mehta
2d7cb22f1f added auth_table patch file: 2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Nabin Hait
0c9a262de4 fixed conflict 2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b fixed conflict 2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8 Merge branch 'master' into dev 2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
 2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Anand Doshi
40fce89631 Favicon for website 
Started work on comments to be embedded in blog page
 2012-07-09 20:02:52 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing 
Login page rendered via a template
 2012-07-09 15:56:12 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
401f12418f Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986 delete unwanted doctypes of website settings 2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966 delete records in child table where parent is missing or parent is like 
old_par%
 2012-06-26 12:15:21 +05:30
Nabin Hait
c6fc345f35 alter tabsessions to change user column definition 2012-06-25 15:30:59 +05:30
Nabin Hait
e5a0086fea alter tabsessions to change user column definition 2012-06-25 15:29:40 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Nabin Hait
34b4d26c1a reload_doc replaced with sync in patch 2012-06-18 11:18:27 +05:30
Nabin Hait
3adfa9595e patch list updated 2012-06-17 21:57:37 +05:30
Nabin Hait
3ad3ebdaec set recurring type as Monthly in all old sales invoice 2012-06-17 21:54:50 +05:30
Anand Doshi
3878b2a1ac add unique constraint to tabSeries name column 2012-06-14 18:28:29 +05:30
Anand Doshi
92fd9cce35 fixes in support ticket and email settings 2012-06-14 14:55:44 +05:30
Anand Doshi
94f26eae7c patch for list of search criteria and reports 2012-06-13 19:04:27 +05:30
Anand Doshi
47afacc8e9 1. Reports List - allow read permission to All 
2. Display message when ToDo doesnt contain any item
 2012-06-13 18:02:43 +05:30
Anand Doshi
443426277b sync purchase invoice item, purchase_receipt_item and purchase order item before patch 2012-06-12 14:17:44 +05:30
Anand Doshi
8eaa2dd570 sync purchase invoice item and purchase order item before patch 2012-06-12 14:16:37 +05:30
Nabin Hait
6581ef9449 fetch organization from lead to quote 2012-06-08 18:19:32 +05:30
Nabin Hait
f74b023106 fetch organization from lead to quote 2012-06-08 18:14:38 +05:30
Nabin Hait
7357fc1817 fetch organization from lead to quote 2012-06-08 18:02:38 +05:30