Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,099 Commits 3 Branches 0 Tags 1 GiB
6781f62c70
Commit Graph

2965 Commits

Author SHA1 Message Date
Nabin Hait
977331806b Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
86207afe15 Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
704a453b7a Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
b7438894f6 Fixes in trends report 2014-06-05 17:55:00 +05:30
Anand Doshi
4022586015 Update new_address_template.py 2014-06-05 17:34:59 +05:30
Rushabh Mehta
5036706f81 removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c02fbd22fa removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
33020a63b8 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c22e11d483 added address template: 2014-06-05 16:01:55 +05:30
Rushabh Mehta
41471c3b44 fixed description in salary manager 2014-06-05 16:01:55 +05:30
Nabin Hait
c8be8ba42c function renamed 2014-06-05 15:18:10 +05:30
Nabin Hait
4d4df03f88 Added total debit / credit row in trial balance. Fixes #1313 2014-06-04 19:00:57 +05:30
Nabin Hait
deb6e06336 minor fix 2014-06-04 19:00:56 +05:30
Nabin Hait
c3d1d6a946 cleanup raw materials supplied table for sub-contraction. Fixes #1743 2014-06-04 19:00:56 +05:30
Nabin Hait
1055139c83 get accounts for opening entry 2014-06-04 19:00:56 +05:30
Nabin Hait
19d1e499c3 Removed Purchase in transit report #1435 2014-06-04 19:00:56 +05:30
Nabin Hait
b161eea793 Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442 2014-06-04 18:57:53 +05:30
Anand Doshi
85479bcbc0 Fixes for apply user permissions and momentjs 2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Anand Doshi
221dec8cac transaction.js: calculate only if one entry in table 2014-06-04 17:48:57 +05:30
Anand Doshi
9a0f6f5bb4 Enable Scheduler in System Settings when Setup Wizard is completed 2014-06-04 17:48:57 +05:30
Anand Doshi
38dedf402b Fixes in patches for migration 2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c Set Employee Name if missing 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
37993dd713 Romanian and Korean Translations 2014-06-04 17:48:55 +05:30
Anand Doshi
cd25301607 Translations 2014-06-04 17:48:55 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51 Merge pull request #1744 from rmehta/develop 
added multiple item select and allow non purchase items in Material Requ...
 2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087 added multiple item select and allow non purchase items in Material Request of type transfer 2014-06-04 13:10:41 +05:30
Anand Doshi
3f6606acdb Merge pull request #1702 from pdvyas/put-version-in-file 
keep version in separate file
 2014-06-04 12:28:37 +05:30
Nabin Hait
67d8b91690 Fixes in bank reconciliation statement 2014-06-04 11:18:25 +05:30
Nabin Hait
ce6977ffe6 Minor fixes in fetching item details 2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6 Parent account mandatory for all non-root accounts 2014-06-03 23:02:02 +05:30
Nabin Hait
b15764ef2c Translation issue fixed in analytics/grid report 2014-06-03 13:02:39 +05:30
Nabin Hait
abb62c76d8 Removed allocated to field from serach fields in support ticket 2014-06-03 10:50:55 +05:30
Nabin Hait
51b7f322cc Closing balance fixes in trial balance. Fixes #1730 2014-06-02 18:47:46 +05:30
Anand Doshi
be99b1240c Merge pull request #1722 from nabinhait/v4-hotfix 
multiple fixes
 2014-06-02 11:09:32 +05:30
Rushabh Mehta
430d132ee0 awesomebar: add tree links 2014-05-31 10:36:42 +05:30
Rushabh Mehta
cc37cc83cd removed section_style 2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8 minor fixes related to path 2014-05-30 19:10:12 +05:30
Nabin Hait
548cf96c44 Minor fixes in sales return 2014-05-30 19:09:59 +05:30
Nabin Hait
0be378af6a Purchase ordered qty can not be less than minimum order qty. fixes #1529 2014-05-30 15:53:20 +05:30
Nabin Hait
fb988ba834 Salary Slip: pull details from salary struture. fixes #1719 2014-05-30 15:53:20 +05:30
Nabin Hait
e6ddd28067 Don't execute reorder_item, if initial setup not completed. fixes #1668 2014-05-30 15:53:20 +05:30
Nabin Hait
1897e75894 Remove blank lines from uploaded file of attendance #1714 2014-05-30 14:31:10 +05:30
Nabin Hait
c1367d9d10 minor fixes 2014-05-30 11:43:00 +05:30
Nabin Hait
cb9bdf43f6 over billing validation fixed 2014-05-30 11:22:16 +05:30
Nabin Hait
6b1a8e0a40 minor fixes 2014-05-30 11:22:16 +05:30
Nabin Hait
7f32cbeb06 Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37 Get valuation rate for fg item base don issued item cost + operation cost. #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
7f03e24c55 Valuation rate of raw materials in BOM. #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824 uom trigger issue in stock entry fixes #1712 2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737 packing slip fixes #1711 2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198 deleted delivery note packing list wise print format 2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea Standard Rate field removed from item. Fixes #1688 2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0 Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706 2014-05-30 11:22:14 +05:30
Nabin Hait
c3cbe2a30c minor fixes in sales invoice validation 2014-05-30 11:22:13 +05:30
Nabin Hait
9bc9b8795b Fixes in stock reconciliation 2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb removed print statement 2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37 pricing rule testcase fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
e7546e2305 SMS Settings added in setup and selling module page. Fixes #1693 2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd pricing list tets case fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
8de61559b0 Minor fixes in sales / purchase analytics. Fixes #1701 2014-05-30 11:22:11 +05:30
Nabin Hait
ea4aa04cc4 Search query for account cleanup 2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Nabin Hait
62ec60188b use build_filter_conditions from db_query. Fixes #1679 2014-05-30 11:22:10 +05:30
Anand Doshi
10cb4799bc Merge pull request #1700 from rmehta/develop 
Various UI Bug Fixes
 2014-05-30 11:12:21 +05:30
Pratik Vyas
8e0438bad4 keep version in separate file 2014-05-28 16:58:55 +05:30
Pratik Vyas
76e48b5c3f hotfix: update_account_root_type.py patch 2014-05-28 15:22:34 +05:30
Rushabh Mehta
1bf9df7c85 removed about 2014-05-28 13:15:32 +05:30
Anand Doshi
32063bb472 Removed designation 'Director' owing to problems with Greek translation 2014-05-27 22:40:53 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Nabin Hait
9c1ae09994 Merge pull request #1689 from rmehta/develop 
fix to pos invoice
 2014-05-26 16:22:03 +05:30
Rushabh Mehta
d82e85d099 fix to pos invoice 2014-05-26 16:01:01 +05:30
Nabin Hait
08dd6af446 Update status based on communication. Fixes #1682 2014-05-26 15:06:42 +05:30
Rushabh Mehta
a7c46e4d83 removed debug in query (packing_slip.py) 2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406 fix to packing slip (validation) 2014-05-26 13:05:19 +05:30
Rushabh Mehta
9f399f139b Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-26 11:40:46 +05:30
Rushabh Mehta
3b0f026522 fix to sales parter 2014-05-24 12:04:13 +05:30
Anand Doshi
8d321446ad Updated translations 2014-05-23 10:29:37 +05:30
Anand Doshi
c783c2636f Updated translations 2014-05-23 09:22:12 +05:30
Anand Doshi
5468740042 Fixed setup wizard errors for chinese simplified 2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817 Setup Wizard: clear cache on language change 2014-05-22 22:52:36 +05:30
Pratik Vyas
e35a1025c9 hotfix: communication email bug 2014-05-22 18:37:55 +05:30
Rushabh Mehta
0f5601dad4 Merge pull request #1677 from rmehta/develop 
Added title_field and added ignore_permission while creating Event from Lead
 2014-05-22 11:23:03 +05:30
Anand Doshi
c57d7dea8b Fixed global_defaults_to_system_settings 2014-05-22 11:05:46 +05:30
Rushabh Mehta
a39cae9c2e added title field to support ticket, lead and employee 2014-05-21 17:34:22 +05:30
Nabin Hait
edf87a258f Create serial no based on series only if item is serialized 2014-05-21 15:38:56 +05:30
Anand Doshi
d6007e7d9c Hook: setup_wizard_success 2014-05-21 15:22:15 +05:30
Rushabh Mehta
92ce693e6f added ignore_permission in Lead for creating Event 2014-05-21 14:59:56 +05:30
Nabin Hait
177fb132b9 description added in setup wizard 2014-05-21 12:39:37 +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
4efc5d74d4 Setup Wizard: company abbr length validation on onchange trigger 2014-05-21 11:53:59 +05:30
Nabin Hait
b5c552faf3 minor fix 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
44ae408b36 Income/expense info in email digest 2014-05-21 11:53:58 +05:30
Nabin Hait
0e6554edc1 Root Type field added in account and patch for existing accoutns 2014-05-21 11:53:58 +05:30
Pratik Vyas
5873e50c50 Release 4.0.2 2014-05-20 16:42:01 +05:30
Pratik Vyas
98c09e2a91 Release v4.0.1 2014-05-20 16:17:22 +05:30
Nabin Hait
c49b7f8c63 minor fix 2014-05-20 15:07:18 +05:30
Nabin Hait
956d7868b5 removed print statement 2014-05-20 10:36:14 +05:30
Nabin Hait
85786f3071 Support ticket / lead status based on communication. Fixes #1645 2014-05-19 19:31:40 +05:30
Nabin Hait
2e0620e370 Server side onload functionality in multiple docs 2014-05-19 18:15:58 +05:30
Anand Doshi
6664af9557 Fixed multilingual UOM issue 2014-05-17 00:07:45 +05:30
Nabin Hait
e60853930b traslation issue fixed in setup wizard and desktop 2014-05-16 19:56:43 +05:30
Nabin Hait
091b48168e Journal voucher debit != credit #fraction issue 2014-05-16 19:56:43 +05:30
Nabin Hait
ad68d64d93 Leave approver select options in leave application and employee 2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94 fix shipping rule test cases (copy name with copy_doc) 2014-05-16 15:19:51 +05:30
Pratik Vyas
3d8f8f68d8 Merge pull request #1652 from anandpdoshi/hotfix 
Do not create Feed when frappe.flags.in_patch
 2014-05-16 12:38:24 +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
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Nabin Hait
bc7659ab90 Employee leave balance report fixes #1647 2014-05-15 11:37:12 +05:30
Anand Doshi
38d5424b21 Do not create Feed when frappe.flags.in_patch 2014-05-14 19:33:21 +05:30
Nabin Hait
ea7e3d6405 Clear default for price_list_currency 2014-05-14 18:52:06 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Anand Doshi
39cc1df560 Fixes #1635, Stock Reconcilation 2014-05-14 15:10:00 +05:30
Anand Doshi
5ce287d611 Setup Wizard width fix for chrome 2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b Fixed Setup Wizard 2014-05-13 21:02:47 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Pratik Vyas
b1f212d653 Merge pull request #1638 from anandpdoshi/hotfix 
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
 2014-05-13 17:38:30 +05:30
Anand Doshi
8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 2014-05-13 16:52:26 +05:30
Nabin Hait
03f3a8a2ef Get taxes and charges records from matser. Fixes #1634 2014-05-13 16:38:31 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
54f0d24d80 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-13 11:33:09 +05:30
Nabin Hait
b76061530e Daily time log fixes #1614 2014-05-13 11:32:39 +05:30
Anand Doshi
d711209dde Fixed patches.txt 2014-05-12 19:42:38 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Nabin Hait
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35 added description to letter head in setup wizard 2014-05-12 16:45:49 +05:30
Anand Doshi
02edae8fac Added hook: setup_wizard_exception 2014-05-12 12:37:32 +05:30
Nabin Hait
bbfe2517ea BOM validation message fixed 2014-05-11 18:27:07 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
0ff6e3a6bb Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402 Test case fixes for serial no 2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9 Test case fixes for pos setting 2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7 Test case fixes in time log batch 2014-05-11 12:08:39 +05:30