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

1014 Commits

Author SHA1 Message Date
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8 [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde utilities/repost_stock file renamed to stock/stock_balance 2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9 Update order reference in return entries and repost reserved / ordered qty 2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry 
Reserved Qty logic cleaned up
 2015-08-25 14:11:12 +05:30
Rushabh Mehta
12fb0d998f [fix] Customer Address and Contact report 2015-08-24 12:21:04 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
6aea1c0da5 Currency validation in gl entry 2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c [enhancement] multi-currency, added fields #1002 2015-08-21 14:31:46 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Rushabh Mehta
1d1f1b06d9 [minor] notify stop/unstop 2015-08-18 17:26:50 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Anand Doshi
7d45929872 Merge pull request #3829 from dottenbr/customer-taxid 
Tax ID added and Customer Details description updated
 2015-08-11 12:33:32 +05:30
Dominik
d1416542a0 Tax ID added and Customer Details description updated 
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
 2015-08-08 00:05:38 +05:30
Rushabh Mehta
48cccca9af [minor] add close button in opportunity and project links in customer 2015-08-06 15:37:01 +05:30
Rushabh Mehta
5bd394278d [fix] test-case, warehouse mandatory for mix type product bundle 2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975 [enhancement] make service type product bundle: 2015-08-04 14:47:45 +05:30
Nabin Hait
d46fb5eb8c Merge pull request #3743 from rmehta/indicator-fix 
[fix] indicators for sales order, purchase order #3736
 2015-07-29 15:53:44 +05:30
Rushabh Mehta
2f3b097d63 [fix] indicators for sales order, purchase order #3736 2015-07-29 13:08:27 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
cc7cb2a70a Allowed frozen_accounts_modifier to create records against frozen customer/supplier 2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734 Test Cases added to check if customer is frozen 2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c Typo fixes in Supplier and Customer Document 2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc Added ability to freeze Customer/Supplier 2015-07-28 12:17:02 +05:30
Anand Doshi
8e8e9c61ca [minor] Show description in Sales Order 2015-07-28 10:46:14 +05:30
Nabin Hait
3cf67a462b Cleanup and test cases for serialized item 2015-07-24 13:26:54 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
05d8174696 Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO 2015-07-22 16:31:34 +05:30
Anand Doshi
285135da8e [ui] Remove 'Stopped' alert banner in Sales Order 2015-07-17 15:14:40 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
1cd049d824 Sales BOM to Product Bundle rename changes 2015-07-13 14:17:42 +05:30
Neil Trini Lasrado
09a66c4201 Fixed issue with Customer Contacts in Transaction Documents 2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Nabin Hait
6e38e917eb Reserved warehouse should not be validated on cancellation of sales order 2015-07-13 11:36:36 +05:30
Nabin Hait
4770a1abb5 Customer's credit days based on fixed days / last day of the next month 2015-07-09 16:35:53 +05:30
Neil Trini Lasrado
ebb60f5dbc Fixed issues in Expired Batches while making Stock Entry 2015-07-08 15:24:02 +05:30
Nabin Hait
73b7efd61d Merge pull request #3583 from rmehta/quotation-list-fix 
[fix] quotation list #3492
 2015-07-06 14:31:23 +05:30
Rushabh Mehta
56912791e2 [fix] quotation list #3492 2015-07-06 11:14:31 +05:30
Rushabh Mehta
85e6f5d04e [fix] [minor] fix customer_name, supplier_name labels 2015-07-03 12:59:08 +05:30
Rushabh Mehta
5105f909d6 [fix] show item description in form grid based on in_list_view 2015-07-02 15:09:18 +05:30
Nabin Hait
56bc215855 Merge pull request #3505 from neilLasrado/print-format 
Recurring Invoice Print Format
 2015-06-29 18:54:24 +05:30
Neil Trini Lasrado
a1f1edc786 Typo fixes in Sales Person 2015-06-29 16:04:12 +05:30
Neil Trini Lasrado
e2d8dd0663 added recurring print format to sales/purchase invoice and order 2015-06-29 12:50:41 +05:30
Nabin Hait
7c5ba957ac Label changed for discount amount in base currency 2015-06-15 15:47:07 +05:30
Neil Trini Lasrado
587bd144d5 Added Customers Not Buying Since Long Time against Sales Invoice 2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
d015195617 fixes in barcode 2015-06-09 15:21:50 +05:30
Nabin Hait
c87595b2da show item description in item grid view if marked for 'In List View' 2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba dynamic link in quotation item 2015-06-03 11:24:37 +05:30
Rushabh Mehta
d3fe7ec858 [cleanup] customer not buying since long time report 2015-06-02 12:21:17 +05:30
Rushabh Mehta
99b18224f5 [minor] remove order_by in listview, let user customize 2015-05-29 12:48:24 +05:30
Nabin Hait
e7b37af525 Merge pull request #3353 from rmehta/barcode-fix 
[fix] clear barcode from table, fixes #3320
 2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c Merge pull request #3354 from rmehta/discount-field-relabel 
[cleanup] rename discount and reserver warehouse #3325
 2015-05-28 11:02:51 +05:30
Rushabh Mehta
69fb13f229 [cleanup] rename discount and reserver warehouse #3325 2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828 [fix] clear barcode from table, fixes #3320 2015-05-27 12:01:03 +05:30
Anand Doshi
fb4e496b54 [fix] target variance sql 2015-05-26 18:15:55 -04:00
Nabin Hait
1f5b21673c minor fix in report 2015-05-26 12:15:39 +05:30
Nabin Hait
2c6705ef83 Merge pull request #3322 from nabinhait/test_case 
Test case
 2015-05-25 16:19:03 +05:30
Nabin Hait
c4fa74f51d sales partner field added in sms center 2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784 removed debug 2015-05-25 14:46:12 +05:30
Nabin Hait
43539673cc [fix] sales person wise transaction summary 2015-05-25 14:13:03 +05:30
Nabin Hait
fd4bcd855b test case fixes 2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763 test case fixes 2015-05-22 16:55:55 +05:30
Neil Trini Lasrado
68a6d61589 filter added for closed oppurtunity 2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad fixes in quotation - from opportunity 2015-05-20 18:51:38 +05:30
Rushabh Mehta
476019a930 [fix] throw name error for duplicate group 2015-05-19 13:03:01 +05:30
Rushabh Mehta
4a3c805049 [fix] sms settings, fixes #3276 2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e [fix] sms center, fixes #3274 2015-05-19 11:00:10 +05:30
Rushabh Mehta
770c258406 [test-fix] case 2015-05-18 12:43:46 +05:30
Rushabh Mehta
9dd8aab211 [fix] status updater 2015-05-18 11:19:10 +05:30
Nabin Hait
f78283fbff customer and supplier dashboard info 2015-05-15 16:58:51 +05:30
Rushabh Mehta
e2e1471f4d [fix] fix breadcrumbs for sales browser fixes #3240 2015-05-15 14:05:10 +05:30
Nabin Hait
90fc19ed9a Item image in print view 2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08 Merge pull request #3242 from neilLasrado/crm 
view leads button added to campaign
 2015-05-13 19:34:36 +05:30
Rushabh Mehta
92015a1268 [fix] [minor] escape in report 2015-05-12 11:32:25 +05:30
Neil Trini Lasrado
6c85479e4f view leads button added to campaign 2015-05-11 17:56:36 +05:30
Rushabh Mehta
ab1ed013b3 [hot] taxes 2015-05-08 11:09:25 +05:30
Rushabh Mehta
55dc66ffcc [fix] index for sales order item 2015-05-07 18:16:49 +05:30
Rushabh Mehta
009378e187 [rename] 2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51 [rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template 2015-05-06 18:45:47 +05:30
Rushabh Mehta
5dbf8a7418 [cleanup] frappe.get_user 2015-05-01 11:51:26 +05:30
Nabin Hait
aa03a8e3a2 Migrate customized precision for newly created total fields 2015-04-30 16:13:47 +05:30
Nabin Hait
042f86e555 advance paid should not be copied and patch to fix affected records 2015-04-28 13:00:23 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Nabin Hait
2029ea9abf toggle editable price list rate 2015-04-16 17:55:35 +05:30
Nabin Hait
c3daa91c8a Reset no-copy fields for recurring docs and patch to fix 2015-04-16 13:13:18 +05:30
Pratik Vyas
2437d4cce2 Fix #3046 Customer Acquisition and Loyalty repor 2015-04-10 12:35:43 +05:30
Nabin Hait
4642d0697e fixed conflict 2015-04-09 11:42:24 +05:30
Anand Doshi
0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop 
Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py
 2015-04-06 13:21:07 +05:30
Rushabh Mehta
7c32770a69 move opportunity item to CRM 2015-04-02 22:06:36 +05:30
Rushabh Mehta
918ddf2537 [task] open, close from list: 2015-04-01 15:43:14 +05:30
Rushabh Mehta
aefc01372f [listview] issue: open, close | so, po: stop, unstop 2015-03-31 13:39:42 +05:30
Sambhaji Kolate
a4fa96cc79 some fix in batch related cleanup 2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859 Added Company field in various Query Reports 2015-03-30 15:21:20 +05:30
Nabin Hait
da5cfb1630 Exchange rate upto 9 decimals 2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82 modified date updated 2015-03-23 14:17:59 +05:30
Nabin Hait
2ed71bac20 Batch related cleanup 2015-03-20 15:06:30 +05:30
Nabin Hait
60aee54c6c currency in test records 2015-03-18 16:06:13 +05:30
Nabin Hait
87ee502dfd Merge pull request #2949 from sbktechnology/develop 
update get_batch_no query to sort batch with expiry date
 2015-03-18 14:29:13 +05:30
Nabin Hait
a1bf43b1a6 Merged develop into v5 2015-03-17 10:50:47 +05:30
Nabin Hait
f2791f8898 manipulate_grand_total_for_inclusive_tax 2015-03-16 17:01:09 +05:30
Anand Doshi
ead48094b6 manipulate diff only if diff <= 0.02 2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c manipulate grand total for inclusive tax 2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8 moved get_list_context to module 2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917 Test case cleanup and fixes 2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693 Test case fixes 2015-03-13 08:14:45 +05:30
Sambhaji Kolate
feff40a930 update get_batch_no query to sort batch with expiry date 
small fix to avoid error msg if item_code not selected and batch_no is entered
 2015-03-11 11:50:28 +05:30
Sambhaji Kolate
845f1c636e code cleanup 2015-03-10 15:19:29 +05:30
Sambhaji Kolate
98dbccd1d6 added actual_batch_qty at warehouse in DN & SI #1873 2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Nabin Hait
b50833a1e8 Fields alignment 2015-03-04 16:14:02 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
5bd8cfd9fe [fix] queries 2015-02-26 12:40:58 +05:30
Nabin Hait
8be6939288 help description for party account 2015-02-26 12:31:07 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Nabin Hait
93b3a37a3b rounding issue and rate trigger 2015-02-24 17:08:51 +05:30
Nabin Hait
903c42a130 multiplefixes 2015-02-24 15:24:49 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02 minor fixes 2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb fixes for base_rate, base_amount, tax_amount: mass search and replace 2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8 Fields added in all sales and purchase doctypes 2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60 Validate taxes and charges input, commonified 2015-02-24 10:02:28 +05:30
Nabin Hait
e9eec93be7 minor fix 2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a Renamed Net total to Total and dynamic label 2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028 discount calculation and in print view 2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430 Fixes for discount amount 2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7 Commonified sales/purchase taxes and charges master.js code 2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf Taxes and totals calculation in party currency 2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e Website Listing 2015-02-23 22:34:27 +05:30
Rushabh Mehta
93b2f167f8 [fixes] opportunity, task minor 2015-02-23 14:43:16 +05:30
Rushabh Mehta
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05 [form] section labels 2015-02-20 16:02:48 +05:30
Rushabh Mehta
dc93e0adc6 [fixes] stock reco 2015-02-20 15:11:56 +05:30
Rushabh Mehta
50dc4e90e3 [cleanup] item grid views, removed desc etc 2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451 [usability] [fixes] stock entry and production order 2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26 [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation 2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b Update sales_order_item.json 2015-02-18 21:11:45 +05:30
Rushabh Mehta
614e7ab757 [cleanup] SMS, and added item filter in stock balance 2015-02-18 19:51:48 +05:30
Neil Trini Lasrado
d8b35639d8 image feild made hidden 2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
c48f06c095 Image field and view added to all selling doctypes 2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9 html item desc removed from item master, item image added in oppurtunity 2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1 listview indicator fix 2015-02-18 12:23:18 +05:30
Nabin Hait
da5f766dd5 fixed conflict 2015-02-18 11:55:13 +05:30
Anand Doshi
8c0f05fbae [minor] grid report loading 2015-02-17 19:53:23 +05:30
Nabin Hait
bd00e81ad5 Commonified taxes and totals calculation in server side 2015-02-17 12:50:51 +05:30
Nabin Hait
6f0a3ed8d4 fixed conflict 2015-02-17 11:12:04 +05:30
Rushabh Mehta
60cfccbf77 [new-module] crm 2015-02-17 10:36:54 +05:30
Nabin Hait
188f69a713 commonified totals calculation in js 2015-02-12 17:55:50 +05:30
Nabin Hait
5690be103c Replaced renamed total fields in code files 2015-02-12 16:09:11 +05:30
Nabin Hait
461ee2ebae Renamed total fields 2015-02-12 11:47:45 +05:30
Nabin Hait
7945712171 Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc 2015-02-11 12:55:10 +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
Neil Trini Lasrado
47a62c623c fixes for #2655 2015-02-06 15:51:20 +05:30
Anand Doshi
9b30a8626c [minor] removed default filters for sales order and material request, fixed pos css 2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316 net_total and grand_total mismatch issue 2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Nabin Hait
d2b762d760 Merge pull request #2617 from neilLasrado/sales-order 
sales order - allow same item to enter multiple times. Throws warning
 2015-02-02 16:44:12 +05:30
Neil Trini Lasrado
809abdf295 lead report - state, country and pincode seprated from address 2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1 [minor] removed company description and don't call apply_price_list if no items 2015-01-30 16:57:24 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
22a4b82bd2 Minor fixes 2015-01-28 13:11:49 +05:30
Anand Doshi
8147f74e4e [minor] Mandatory filters in Customer Acquisition and Loyalty 2015-01-27 13:16:18 +05:30
Nabin Hait
d41f3c1f5e All the calculations in taxes_and_totals file 2015-01-23 16:24:49 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Nabin Hait
b4a3dfa893 All the calculations in taxes_and_totals file 2015-01-22 17:13:13 +05:30
Nabin Hait
963393409e minor fix: child table length 2015-01-21 17:22:11 +05:30
Neil Trini Lasrado
f108c2df72 sales order - allow same item to enter multiple times. Throws warning 2015-01-21 14:33:49 +05:30
Nabin Hait
ea61046e8d Updated Quotation Status 2015-01-21 14:08:06 +05:30
Rushabh Mehta
81e972eac4 [cleanups] 2015-01-19 17:34:54 +05:30
Nabin Hait
dd4617d30f Opportunity From field is mandatory 2015-01-16 15:08:00 +05:30
Nabin Hait
239c2c327c Hide currency and price list section after submission 2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +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
Rushabh Mehta
d49a123fd0 [ui] listviews 2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
a17d7cea34 test records fixed 2015-01-07 15:42:59 +05:30
Rushabh Mehta
738d4ef5c8 [ui] [listviews] indicators 2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f [design] Point of Sale 2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Nabin Hait
5515b1ea7f minor fix 2015-01-05 08:18:15 +05:30
Nabin Hait
8a00319962 minor fix 2015-01-04 17:27:40 +05:30
Anand Doshi
3f5e95a99e [design] Fixed Grid Reports 2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43 [tree] [ui] 2015-01-01 12:49:18 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c [design] wip 2014-12-26 12:52:11 +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
cb11f27558 Customer should not copied from lead to opoortunity 2014-12-19 10:51:59 +05:30
Nabin Hait
0f2137be18 no copy property for customer's po no 2014-12-16 10:37:55 +05:30
Nabin Hait
ad0bd4ca92 Pull all customer's po no in delivery note when made from multiple sales order 2014-12-12 12:49:45 +05:30
Nabin Hait
5cc0531d27 Merge pull request #2451 from revant/develop 
"From time" cannot be later than "To time" and hours cannot be negative
 2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
d0a44ca85c Changed contact_date to Datetime so appointment or call with time can be scheduled 2014-12-01 23:31:53 +05:30
Nabin Hait
1b5afe737f Fixes in authorization rule based on average discount 2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Nabin Hait
b74ae7aa31 Minor fix for order to invoice mapping 2014-11-24 18:17:01 +05:30
Rushabh Mehta
2f4567fa3c [minor] [ux] address refresh for lead 2014-11-24 15:18:40 +05:30
Rushabh Mehta
7d36875d6f [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:47 +05:30
Nabin Hait
ccd9fd3e94 Rounding in totals calculation 2014-11-14 14:27:24 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Neil Trini Lasrado
6fc2821e5f fix - validations added for auto fetch of cost center 2014-10-28 14:36:26 +05:30
Nabin Hait
10b155a486 cost center based on project 2014-10-23 13:18:59 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
73804580d4 validate quotation to lead or customer 2014-10-20 11:18:11 +05:30
Nabin Hait
30a0e3e8b4 Merge pull request #2275 from ankitjavalkarwork/fix2164 
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
 2014-10-10 18:05:19 +05:30
ankitjavalkarwork
ad3d698fd8 [#2164] Add test case for delivered qty in Sales Order 2014-10-10 16:59:47 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
eaae58f507 Transaction.js fixed , code commonified 2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198 fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6 Fixed issues 2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508 [fix][#1450] Add Shipping Addr field to Sales Invoice 2014-10-09 12:11:49 +05:30
ankitjavalkarwork
1b2944e871 Rearrange To/From, Recurring Type field for better UX 2014-10-08 14:24:58 +05:30
ankitjavalkarwork
fe7a6b502a Add Customer Credit Balance Report, minor changes 2014-10-07 11:41:31 +05:30
Nabin Hait
f065b756e5 Update customer.json 2014-10-06 17:50:58 +05:30
Nabin Hait
997a7a1d3e Test case fixes 2014-10-06 13:15:21 +05:30
Nabin Hait
db030d1761 Set Receivable/Payable account based on party 2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7 Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type 
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
 2014-10-06 13:12:05 +05:30
Nabin Hait
3a40435f8c Credit days and credit limit option in customer group / supplier type #1354 2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f Credit Limit and credit days fixes #2031 2014-10-06 13:05:28 +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
ankitjavalkarwork
9e5f319d80 [#2253] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO 2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Stefan Siegel
76a8c75592 Fix opportunities not showing in "Linked With" dialog 2014-10-03 13:25:42 +02:00
Anand Doshi
1394509343 Fixes for recurring document 2014-09-21 19:45:49 +05:30
Anand Doshi
8370cb3e71 Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop 2014-09-18 12:06:05 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9 [email] remove communicationlist #561 2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0 [cleanup] removed communication js, fields 2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
Nabin Hait
c25681c36c Added item group and brand in sales-person-wise transaction summary report 2014-09-16 12:28:40 +05:30
Sambhaji Kolate
930e7f5578 fix conflict 2014-09-15 12:43:48 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b [minor] ui/ux fixes in Payment Tool 2014-09-12 15:42:16 +05:30