Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,447 Commits 3 Branches 0 Tags 1 GiB
1d830dfd92
Commit Graph

1726 Commits

Author SHA1 Message Date
Nabin Hait
d681c88d79 validate returned qty only if there is reference qty 2017-04-06 15:20:45 +05:30
Rohit Waghchaure
faf51d91b6 [fix] stock qty issue in purchase trends report 2017-04-05 14:53:26 +05:30
Nabin Hait
6f038bc1f3 Validate total advance against grand total considering write off amount 2017-04-03 17:56:05 +05:30
Nabin Hait
9300013acc Validate total advance against grand total considering write off amount 2017-04-03 17:35:58 +05:30
Nabin Hait
8d8cba7faa Validate total advance against grand total considering write off amount 2017-04-03 17:26:32 +05:30
Rushabh Mehta
cc8b2b2fdb [fix] [refactor] demo for v8 and remove purchase common 2017-03-31 17:36:48 +05:30
Dominik Ottenbreit
6eb202ef3a fix patch after test, fix variant based on manufacturer, add json for item_manufacturer 2017-03-24 14:49:52 +01:00
Nabin Hait
4a8a62a202 Merge pull request #8053 from umairsy/video-pages 
updated erpnext-learn pages
 2017-03-23 17:02:34 +05:30
Rushabh Mehta
a07c43fd68 [feature] ability to have variants based on manufacturer 2017-03-21 17:48:34 +01:00
Umair Sayyed
024896d806 updated erpnext-learn pages 2017-03-17 12:55:01 +05:30
Nabin Hait
56f650f342 Merge branch 'master' into develop 2017-03-15 11:28:07 +05:30
Rushabh Mehta
82c258948d [fixes] for recurring and tests 2017-03-14 19:13:39 +05:30
Rohit Waghchaure
11fa7a9311 [fix] Removed customer, supplier and added link_name from website_list_for_contact file 2017-03-14 13:26:10 +05:30
Saurabh
4f4d0a8369 [fix] validate negative quantity while creating purchase receipt 2017-03-13 15:37:47 +05:30
Rohit Waghchaure
0169341917 [Fix] Item variants broken when using naming series for items and vriants of numeric value 2017-03-10 19:40:08 +05:30
Nabin Hait
e68f32cf19 UOM Conversion in selling 2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a UOM Conversion in Selling 2017-03-06 16:41:12 +05:30
Nabin Hait
a07c3193cf Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos 
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
 2017-03-04 18:32:40 +05:30
Rohit Waghchaure
a31ffbc745 [Fix] Sales Return Invoice (Is POS) doesn't show correct payment data 2017-03-03 16:28:49 +05:30
Nabin Hait
2bcacec5c6 Merge pull request #7576 from RobertSchouten/compact_dev 
[fix] compact print format not longer ignores format builder
 2017-02-24 13:09:18 +05:30
Nabin Hait
cd837ecbac Merge branch 'develop' into develop 2017-02-20 19:09:20 +05:30
Nabin Hait
9f4cb0c097 Fixed merge conflict 2017-02-20 15:00:04 +05:30
Rohit Waghchaure
4b9d2f2733 [Fix] Cleanup supplied items if supply raw material is set as No 2017-02-16 18:53:23 +05:30
suyashphadtare
34ab136b46 [fix] Remove un-necessary Whitespace 2017-02-10 19:14:43 +05:30
suyashphadtare
750a067688 [minor][fix] Show all warehouses with item actual qty in warehouse set query 2017-02-10 19:14:43 +05:30
suyashphadtare
049a88cc40 [minor] Show item quantity in warehouse set query 2017-02-10 19:14:43 +05:30
Nabin Hait
6ff0caa87a Fixed merge conflict 2017-02-08 11:33:33 +05:30
Nabin Hait
0a6aaf4257 Get standard/historical valuation rate where missing: some minor fixes 2017-02-07 12:50:22 +05:30
Nabin Hait
ea8fab52c6 Get standard/historical valuation rate where missing, if item is not a sample item 2017-02-07 01:24:32 +05:30
Rushabh Mehta
a3d0bea375 Merge branch 'develop' into remove-party-status 2017-02-02 15:42:04 +05:30
Rushabh Mehta
87037bdd56 [minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568 2017-01-30 13:22:51 +05:30
Rohit Waghchaure
92c9ad8c72 Merge branch 'master' into develop 2017-01-28 14:14:33 +05:30
Kanchan Chauhan
b77eaf7053 [URGENT][FIX]Stock Controller fix 2017-01-28 13:26:46 +05:30
Rushabh Mehta
710dc5392f [merge] 2017-01-27 15:48:31 +05:30
Nabin Hait
cb19f52985 Update stock_controller.py 2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15 [Fix] Get valuation rate from item master and update stock value difference 2017-01-25 18:47:53 +05:30
robert schouten
67eff49516 [fix] compact print format not longer ignores format builder 2017-01-25 08:20:43 +08:00
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
Nabin Hait
4c952f48f8 Some minor fixes 2017-01-20 15:15:31 +05:30
Nabin Hait
a0b967f2cd Get valuation rate from Item while not found based on SLE 2017-01-20 12:50:40 +05:30
Rohit Waghchaure
56cc542eb7 [Fix] sales return discount issue 2017-01-18 14:50:24 +05:30
Nabin Hait
dd839055e3 Fixed merge conflict 2017-01-17 15:52:56 +05:30
Rohit Waghchaure
f58cad6b13 [Fix] Calculate paid amount when is pos is enabled 2017-01-17 12:11:57 +05:30
Rushabh Mehta
ffd80a6061 [fix] warehouse test cases 2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f [fix] warehouse test cases 2017-01-16 16:57:53 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
b251cd4ccb Fixed merge conflict 2017-01-13 14:34:54 +05:30
Rohit Waghchaure
29458836e4 [Fix] After amend the status become cancelled even if docstatus is zero 2017-01-13 12:51:19 +05:30
Nabin Hait
007c87ea63 Merge pull request #7440 from nabinhait/gle_repost_optimization 
Optimization to reduce GLE reposting time for future stock transactions
 2017-01-13 11:33:42 +05:30
Nabin Hait
9784d27317 Optimization to reduce GLE reposting time for future stock transactions 2016-12-30 16:21:35 +05:30
Nabin Hait
58291c77e9 Fixed version conflict 2016-12-23 17:43:42 +05:30
Rushabh Mehta
0632ee3da9 Merge branch 'v7.2.0-beta' into develop 2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f [fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253 2016-12-21 17:30:29 +05:30
Nabin Hait
f573d43b90 fixed version conflict 2016-12-20 11:40:15 +05:30
Nabin Hait
3fe99559ef Fixed negative stock validation message for translation and fixed test cases 2016-12-16 15:30:43 +05:30
Rohit Waghchaure
6500ef404d [Fix] Timeout error in item attribute validation 2016-12-16 13:35:50 +05:30
Nabin Hait
8c61f343b3 Validate negative stock on delivery while missing valuation rate for booking expenses 2016-12-15 13:46:03 +05:30
Nabin Hait
f49bbe1142 Cleanup of lead and opportunity status updating logic 2016-12-15 11:51:54 +05:30
Nabin Hait
ad4f1c7fd1 date is optional in get_exchange_rate 2016-12-09 12:14:47 +05:30
Nabin Hait
3113f00c46 Replaced spaces with tabs 2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc Fixes and patch for Currency Exchange based on date 2016-12-08 15:36:23 +05:30
Nabin Hait
1cc55fbbcb Fixed merge conflict 2016-12-08 14:09:23 +05:30
Nabin Hait
a8333be6ad Merge pull request #7023 from frappe/revert-7012-remove-count-star 
Revert "[optimize] remove count(*) from queries"
 2016-11-24 13:26:38 +05:30
Nabin Hait
f89f17cdde Merge branch 'master' into develop 2016-11-23 16:00:22 +05:30
Nabin Hait
297d74a997 Unlink payment entries on cancellation of invoice 2016-11-23 15:59:00 +05:30
Rushabh Mehta
9872d8cdb5 Revert "[optimize] remove count(*) from queries" 2016-11-21 21:04:47 +05:30
Nabin Hait
d50d6a559c Merge pull request #7012 from rmehta/remove-count-star 
[optimize] remove count(*) from queries
 2016-11-21 15:28:01 +05:30
Rushabh Mehta
5a258cbc2d [optimize] remove count(*) from queries 2016-11-21 14:57:36 +05:30
Nabin Hait
c2f8dd71d7 Merge pull request #6965 from manassolanki/qa_redesign 
[Fix] [Enhancement] Quality Inspection
 2016-11-21 14:49:18 +05:30
Manas Solanki
60db98aaff [Minor] Variable assignment before reference 
Variable = 'inspection_required_fieldname'
 2016-11-18 14:52:13 +05:30
KanchanChauhan
49a50fef63 Group same item in SO print (#6959) 2016-11-18 13:57:53 +05:30
Nabin Hait
c9b6a07732 [fix] Remove recurring id on amendment only if it is same as amended_from 2016-11-16 18:43:44 +05:30
Nabin Hait
7f6b99aca4 Merge pull request #6962 from KanchanChauhan/payroll-fixes 
[Fix] Filters to get employee in Payroll
 2016-11-16 17:34:00 +05:30
Nabin Hait
8af429da1f Cleanup and fixes in quality inspection feature 2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5 Quality Inspection Issue 
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
 2016-11-16 17:22:38 +05:30
mbauskar
e9747a8a6e [minor] fixes in validate selling price 2016-11-16 17:19:47 +05:30
Kanchan Chauhan
7652b857c8 [Fix] Filters to get employee in Payroll 2016-11-16 15:29:01 +05:30
rohitwaghchaure
7be942db54 [Fix] Status updater for sales order in purchase order (#6944) 2016-11-16 11:14:32 +05:30
rohitwaghchaure
b3ba7f01ef [Fix] PO status not changed as material return created against them (#6869) 2016-11-16 11:10:10 +05:30
Rohit Waghchaure
2285f90b64 added debit and credit note status 2016-11-09 14:47:24 +05:30
Rohit Waghchaure
2f1db57fe1 Added status field in sales invoice and purchase invoice 2016-11-08 18:49:58 +05:30
Nabin Hait
d662502f3c [fix] Validate if warehouse is not linked to any account 2016-10-24 18:17:57 +05:30
Nabin Hait
9f26bc16b7 Update selling_controller.py 2016-10-20 16:45:53 +05:30
shreyas
e8aaa92816 [Minor] Some more fixes to the code 2016-10-20 15:57:45 +05:30
shreyas
edcba51c8b [Fix] Added check to validate selling price against valuation rate 2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45 [Minor] Validate purchase price against selling price 2016-10-20 15:57:45 +05:30
Nabin Hait
fa1cdd5bf0 Fixed merge conflict 2016-10-18 15:37:33 +05:30
Nabin Hait
fcd10f2e08 Merge pull request #6335 from RobertSchouten/stock_entry 
[fix] warning for creating stock entry after sales invoice (causing missing gl entries)
 2016-10-17 17:39:57 +05:30
Nabin Hait
e040510545 Always calculate additional discount amount if percentage is mentioned 2016-10-13 12:14:47 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Nabin Hait
2f75b7b42e Fixed merge conflict 2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633 [Fix] sales order status showing completed, while it's status was to bill 2016-10-07 13:55:48 +05:30
Rohit Waghchaure
7d5298997b Documentation for payments 2016-10-06 16:49:39 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
cccc45edc5 Don't throw expense account validation on fetching item details 2016-10-05 17:15:53 +05:30
Nabin Hait
5fd5a77750 Fixed version conflict 2016-10-03 14:13:50 +05:30
Saurabh
4f62c4cf2d [minor][fix] for condition maker 2016-10-03 12:48:25 +05:30
Rohit Waghchaure
21499e820d [Enhancement] Supplier quotation added on supplier portal 2016-09-21 17:07:25 +05:30
Chude Osiegbu
256ec170d0 Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate 2016-09-19 03:53:37 +01:00
Chude Osiegbu
1f64f9897c Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments. 2016-09-19 01:34:49 +01:00
Chude Osiegbu
7e74fb4357 Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call 2016-09-19 00:59:25 +01:00
RobertSchouten
db33ebb0ff [fix] status updater percent when qty is minus value 2016-09-12 14:54:46 +08:00
robert schouten
6465711ca6 [fix] missing gl entries warnings 2016-09-12 11:17:14 +08:00
Nabin Hait
b8b228ed14 Fixed version conflict 2016-09-06 17:56:32 +05:30
Nabin Hait
ca627fb806 [fix] Fetch advance journal entry in invoice if it is tagged against linked order 2016-09-05 16:17:08 +05:30
Nabin Hait
406f0a38de Fixed merge conflicts 2016-09-05 15:44:18 +05:30
Nabin Hait
8693b5c93a Minor fixes 2016-09-05 11:51:45 +05:30
Rohit Waghchaure
560ba391f9 [Enhancement] Purchase return for rejected qty 2016-09-05 00:43:17 +05:30
Nabin Hait
5c69fed218 Ignore closed sales/purchase order in trends report 2016-09-02 12:53:18 +05:30
Rohit Waghchaure
609e2b4ca3 [POS] Currency format issue 2016-08-31 02:04:53 +05:30
Nabin Hait
a26bb96d2d Merge pull request #6178 from nabinhait/status_updater_fix 
Ignore validating billed amount against order if order item amount is zero
 2016-08-26 12:09:39 +05:30
Nabin Hait
47a3f639ed Ignore validating billed amount against order if order item amount is zero 2016-08-26 11:39:39 +05:30
Rohit Waghchaure
efb5bf2cfc [POS] Fixed payment gl entry for sales return 2016-08-25 16:23:47 +05:30
Rohit Waghchaure
ea6d7e9b09 [Fix] decimal button not working 2016-08-23 11:39:44 +05:30
Nabin Hait
3b6dc141c6 [fix] Repost only distinct purchase receipts and invoices 2016-08-19 16:39:50 +05:30
Rohit Waghchaure
baef2624a2 Given provision to enter write off and change amount on POS 2016-08-10 00:50:53 +05:30
Rohit Waghchaure
7127a8f522 Allow user to edit change amount from sales invoice form for is pos 2016-08-08 23:19:18 +05:30
Nabin Hait
99d4ff4a29 Repost gle for future transactions if update stock checked in back dated purchase invoice 2016-08-08 14:12:58 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Rohit Waghchaure
26cf01aaba [mionr] fixes and cleanups 2016-07-26 00:30:25 +05:30
Maxwell Morais
3557261313 Extend search_fields for customer querie 
This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie
 2016-07-21 23:42:59 -03:00
Rushabh Mehta
fc8e589295 [fix] party status updating bug, fixes #5794, #5796 2016-07-20 12:09:27 +05:30
Rushabh Mehta
5c52fa9785 [fix] variant error message 2016-07-18 14:40:14 +05:30
Rushabh Mehta
95383bb281 [fix] item attribute validation and tests 2016-07-15 15:12:06 +05:30
Rushabh Mehta
20122aef79 [minor] optimize item attribute validation for #5756 2016-07-15 12:42:41 +05:30
Rushabh Mehta
b8bdfbcead [minor] optimize item attribute validation for #5756 2016-07-15 12:41:08 +05:30
Rushabh Mehta
ea0ff23891 [cleanup] form dashboards 2016-07-07 14:28:05 +05:30
Rohit Waghchaure
a71d9d33af Rename prevdoc field in purchase order and purchase receipt doctype 2016-07-06 12:13:29 +05:30
Nabin Hait
ff2f3ef1b1 Test Case Fixes 2016-07-04 11:42:25 +05:30
Nabin Hait
9db1b223da Payment Entry: Test cases and default remarks 2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68 Make payment entry aginst order, payment request and patch to rename advance table fields 2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d Payment Entry from invoice 2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d Payment Reconciliation changes for Payment Entry 2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4 Advance Payment Entry adjustment against Invoice 2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7 Payment Entry submission and more 2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519 [new][feature] Payment Entry 2016-07-04 11:41:24 +05:30
Rushabh Mehta
b33df4afe8 [cleanup] link methods made common 2016-07-04 11:39:25 +05:30
Rushabh Mehta
878dfec46a [minor] 2016-07-04 11:39:25 +05:30
Saurabh
78333c7e07 [fixes] check group condition 2016-06-26 14:27:46 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Rushabh Mehta
2cb7a9f235 [ux] taxes table editable 2016-06-15 16:45:03 +05:30
Alec Ruiz-Ramon
fcaaa29a58 Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead 
cleanup
squashed
 2016-06-09 21:17:57 -04:00
Anand Doshi
34482788f4 [fix] removed bad import 2016-06-09 16:57:16 +05:30
Rushabh Mehta
aed79e993f [fix] item attribute validation, fixes #5308 2016-06-02 17:49:16 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Rohit Waghchaure
6087fe178e [Enhancement] POS 2016-05-09 23:36:15 +05:30
Nabin Hait
a9c4c8fc31 In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate 2016-05-09 17:34:47 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Nabin Hait
8704bead49 [fix] Validate returned serial nos and batch nos with original document 2016-05-06 15:30:10 +05:30
Nabin Hait
cd0e8ce8ad Fixes and modification in fixed asset 2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Nabin Hait
ffd1e4efe6 Removed db_set from inside validate 2016-04-18 15:58:44 +05:30
Saurabh
fbb342c1ac [enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI 2016-04-18 15:58:43 +05:30
Saurabh
130c57b201 [fixes] code clean-up 2016-04-18 15:58:43 +05:30
Saurabh
e29248bcb3 [fixes] test-case to validate quantity after update stock and purchase return and code-cleaning 2016-04-18 15:58:43 +05:30
Saurabh
43520f93a1 [fixes] test cases, code cleanup. 2016-04-18 15:58:42 +05:30
jof2jc
524ebbcbb9 Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice 2016-04-18 15:57:55 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rohit Waghchaure
ae270d6648 [Fixes] Supplier can view their addresses, default buying price list issue 2016-04-11 13:58:33 +05:30
Anand Doshi
2f957f27b0 [fix] apply Tax Rule for lead 2016-04-08 17:43:08 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
Anand Doshi
15f7b1ee1a [fix] POS paid amount validation using grand total 2016-04-04 15:03:28 +05:30
Rushabh Mehta
948ebfef16 Merge pull request #5108 from neilLasrado/expense-querry 
Fixed bug in get expense query
 2016-04-01 11:44:11 +05:30
Rushabh Mehta
8ca426d94a Merge pull request #5095 from rohitwaghchaure/new_rfq 
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
 2016-04-01 11:41:15 +05:30
Rushabh Mehta
fff8e6c733 Merge pull request #5080 from nabinhait/fy_overlap 
[fix] Added overlap validation in fiscal year
 2016-04-01 11:37:03 +05:30
Neil Trini Lasrado
30b97b0b45 Fixed bug in get expense query 2016-03-31 23:10:13 +05:30
rohitwaghchaure
62fea0374b [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party 2016-03-31 21:49:07 +05:30
Rushabh Mehta
acf28af19c [fix] set default depreciation accounts and test fix 2016-03-31 15:04:06 +05:30
Nabin Hait
2ed0b59747 [fix] Added overlap validation in fiscal year 2016-03-31 12:40:37 +05:30
Nabin Hait
6123560f51 Merge pull request #5076 from vjFaLk/develop 
Fix for Opportunity
 2016-03-31 11:55:07 +05:30
Nabin Hait
c6285069dc [fix] Item query in bom 2016-03-30 13:10:25 +05:30
Rushabh Mehta
c78b3110b5 [enhancement] configurable portal menu; 2016-03-30 12:29:48 +05:30
Nabin Hait
e8e2d406b5 minor fix 2016-03-29 18:17:03 +05:30
Rushabh Mehta
1d05ada5e9 Merge pull request #4950 from nabinhait/fixed_asset_depreciation 
Fixed asset depreciation
 2016-03-29 16:39:31 +05:30
Rushabh Mehta
7a1b5da830 [cleanup] request for quotation cleanup 2016-03-29 16:04:43 +05:30
Nabin Hait
4fdb05228d fixed asset depreciation 2016-03-29 11:54:37 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Valmik Jangla
29563275f5 Fix for Opportunity 2016-03-29 11:18:36 +05:30
Rushabh Mehta
d3fdbaa261 Merge pull request #5041 from nabinhait/recurring_doc_amend 
[fix] Reset recurring id on amendment
 2016-03-28 18:29:44 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature 
[Enhancement] Add margin in sales flow.
 2016-03-28 18:27:05 +05:30
rohitwaghchaure
a1064a6149 [enhancement] request for quotation 2016-03-28 17:28:45 +05:30
mbauskar
a52472cf5b [fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py 2016-03-24 14:07:51 +05:30
mbauskar
dcd8b7773d [fix] calculated rate on py side, added depends on for sales order item 2016-03-24 14:07:50 +05:30
mbauskar
46c97c6e95 [fix] discount percentage fix 2016-03-24 14:07:50 +05:30
mbauskar
36b5189163 calculated the rate and total margin 2016-03-24 14:07:49 +05:30
mbauskar
c97becbd15 added document type in args 2016-03-24 14:07:49 +05:30
Nabin Hait
7504ea7033 [fix] Reset recurring id on amendment 2016-03-23 12:07:34 +05:30
rohitwaghchaure
49ccac5d95 [formatting] Added between in trends.py 2016-03-21 12:31:41 +05:30
Nabin Hait
5996b2f1bb [fix] recurring document logic 2016-03-18 15:19:54 +05:30
rohitwaghchaure
90ff509f6d [fix]Earlier recurring billing 2016-03-18 10:44:53 +05:30
rohitwaghchaure
5b9d517d04 [fix]Fiscal year removed from trends report 2016-03-17 22:46:09 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Nabin Hait
22d4a7e742 Merge branch 'prod-order' of https://github.com/neilLasrado/erpnext into neilLasrado-prod-order 2016-03-16 12:18:01 +05:30
Nabin Hait
df4deba515 minor fix 2016-03-16 11:16:31 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
6c3cc3647b Merge pull request #4969 from rmehta/link-count 
[enhancement] sort links on basis of link_count (idx)
 2016-03-15 11:40:18 +05:30
Nabin Hait
b1f0a7d52e Merge pull request #4876 from saurabh6790/valuation_rate_on_so 
[enhancement] get valuation rate and gross profit on sales order item
 2016-03-14 19:18:58 +05:30
Anand Doshi
c75c1d7e3e [fix] additional fixes after deprecating Fiscal Year 2016-03-11 14:56:19 +05:30
Rushabh Mehta
3574b37ff3 [enhancement] sort links on basis of link_count (idx) 2016-03-11 14:33:04 +05:30
Valmik Jangla
13bb2ba779 Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance 2016-03-11 13:07:49 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal 
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
 2016-03-11 13:07:48 +05:30
Valmik Jangla
c7e774fda9 BudgetError Fix 2016-03-11 13:05:20 +05:30
Valmik Jangla
319bbad4d4 Removed from Stock Entry 2016-03-11 13:05:19 +05:30
Saurabh
d313553ae3 [enhancement] get valuation rate and gross profit on sales order item 2016-03-09 15:42:00 +05:30
shreyas
6f8dfa4c8d [Minor] Fix print settings for custom print format 2016-03-07 18:22:40 +05:30
Rushabh Mehta
571a9d0f19 [fix] [tests] 2016-03-03 15:03:40 +05:30
Rushabh Mehta
756e518bc1 [fix] recurring 2016-03-03 13:00:30 +05:30
Rushabh Mehta
69cfab8559 [fix] [patch] recurring 2016-03-03 10:37:45 +05:30
Rushabh Mehta
5839a8d7f0 [fixes] usability cleanup of recurring document and added explicit submit_on_creation 2016-03-02 17:51:52 +05:30
ShashaQin
425ab6bb1e Update queries.py 2016-03-02 13:07:58 +08:00
ShashaQin
8d1dea6aad Update recurring_document.py 2016-02-27 14:00:58 +08:00
ShashaQin
ed71e6cea6 Update test_recurring_document.py 2016-02-25 15:47:25 +08:00
ShashaQin
5afca21571 Update test_recurring_document.py 2016-02-25 15:21:14 +08:00
ShashaQin
6071ddc3dd Update recurring_document.py 2016-02-25 11:25:24 +08:00
patilsangram
bf2b511988 [Removed Stop Button from SO and PO] 2016-02-22 16:24:23 +05:30
Nabin Hait
fa413bbab2 Update accounts_controller.py 2016-02-18 18:23:31 +05:30
Nabin Hait
67f40775ff Update accounts_controller.py 2016-02-18 17:10:42 +05:30
Revant Nandgaonkar
78a62fe123 change args of set_balance_in_account_currency 
https://github.com/frappe/erpnext/pull/4832
 2016-02-18 16:48:35 +05:30
Revant Nandgaonkar
5da941b82c Need to use set_balance_in_account_currency 
b9ad5178e4
needed to make GL Entry
 2016-02-18 16:02:05 +05:30
Anand Doshi
ed8d9dadfa [fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock 2016-02-17 17:14:11 +05:30
Anand Doshi
9a933788be [cleanup] Compact Item Print 2016-02-16 15:30:17 +05:30
ShashaQin
fd08750e1c Update print_settings.py 2016-02-16 15:07:09 +05:30
ShashaQin
429ab205d4 Update print_settings.py 2016-02-16 15:07:09 +05:30
Nabin Hait
adc0923c7e [fix] validate advance only if invoice total is positive 2016-02-09 10:32:41 +05:30
Nabin Hait
289ffb788c [fix] Advance adjustment in invoice cannot be greater than grand total 2016-02-08 11:07:00 +05:30
Nabin Hait
82cef59fb3 [fix] Purchase Return warehouse validation 2016-02-02 19:05:43 +05:30
shreyas
e970ddcee9 [Fix] 
1. Sales Person wise transaction report
2. Sales Person wise target variance report
3. Sales order trend report generation for selection in group by feild
 2016-01-29 15:41:44 +05:30
Anand Doshi
9c24bec654 Merge branch 'nabinhait-mc_fix_5' into develop 2016-01-29 12:16:35 +05:30
Anand Doshi
7c0a58ac3f [fix] show formatted currency value in advance paid validation 2016-01-29 12:16:24 +05:30
Nabin Hait
5bedd649df Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item 
[cleanup] Removed 'Is Service Item' checkbox and filters
 2016-01-29 11:10:54 +05:30
Nabin Hait
b2206d1155 [fix] Multi currency advance payment against Order 2016-01-27 15:43:24 +05:30
shreyas
eba9ca4d66 [Minor]Change to maintain args ordering convention 2016-01-26 16:29:26 +05:30
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters 
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
 2016-01-26 16:22:51 +05:30
shreyas
f76853a8d9 [Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen 2016-01-25 21:25:11 +05:30
shreyas
2563f404d2 [Minor Change] Updated queries.py 2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5 Added Disabled field to Supplier and Customer doctype 
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
 2016-01-25 18:19:13 +05:30
Anand Doshi
39e2c2bb09 [fix] obey no_copy while creating recurring documents 2016-01-25 17:03:50 +05:30
Saurabh
47fd5e0ff0 [fixes] compare variants in lower case 2016-01-21 15:46:55 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
dbbc3eb8a6 Merge pull request #4656 from nabinhait/gle_rounding 
[fix] Round off gle due to currency conversion
 2016-01-20 16:48:42 +05:30
Nabin Hait
5b19aeecb4 Merge pull request #4642 from nabinhait/return_fix1 
[fix] Accept return items in any warehouse
 2016-01-20 16:46:33 +05:30
Nabin Hait
61673aafd4 Merge pull request #4640 from nabinhait/fix50 
Fixes
 2016-01-20 16:35:46 +05:30
Nabin Hait
d4507ac6a0 [fix] Round off gle due to currency conversion 2016-01-20 16:14:27 +05:30
RicardoJohann
3fb5340188 Update queries.py 2016-01-20 14:32:59 +08:00
Nabin Hait
20105d8a0d [fix] Accept return items in any warehouse 2016-01-19 18:05:28 +05:30
Nabin Hait
34d2822483 Fixes in get_item_details and test cases 2016-01-19 16:48:32 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
10d634b016 [fix] set sales partner from previous document, fixes #4611 2016-01-14 10:34:18 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f Billing status in Purchase Receipt 2016-01-06 15:42:43 +05:30
Nabin Hait
5b13b99441 Update billing status in Delivery Note if directly invoiced against SO 2016-01-06 15:42:27 +05:30
Nabin Hait
6b068e1367 [fix] Disable atrribute table in variant item record 2015-12-31 15:44:12 +05:30
Nabin Hait
6626e32719 [fix] Disable atrribute table in variant item record 2015-12-31 14:54:57 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Saurabh
70ed6ede5c [fixes] patch to update delivery status for drop ship item 2015-12-08 14:48:19 +05:30
Nabin Hait
c4edcf1532 [fix] Recurring test case fixed for the 1st day of the month 2015-12-01 16:28:35 +05:30
Nabin Hait
ddc295b4b3 [minor] Set expense account as Stock RBNB for perpetual inventory after mapping 2015-11-30 18:40:28 +05:30
Anand Doshi
ebae726237 [fix] status update - update qty after int float not null change 2015-11-25 17:55:47 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Nabin Hait
90c6d7bb47 [fix] Invoice Outstanding calculation related to advance 2015-11-13 14:04:03 +05:30
Rushabh Mehta
d48c2394e8 [cleanup] drop ship testing & cleanup 2015-11-04 15:24:04 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Rushabh Mehta
00b4663e12 Merge pull request #4262 from saurabh6790/close_pr_dn 
[feature] Close feature for Purchase Receipt and Delivery Note
 2015-11-02 15:21:19 +05:30
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Anand Doshi
aba8fdd18d [fix] issues encountered migrating from v3/4 to 6 2015-10-31 22:49:42 +05:30
Saurabh
6956eee790 [fixes] test case and code rewrite 2015-10-29 19:43:35 +05:30
Saurabh
6d64fe378d [fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1 2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97 [enhance] make PO from SO if supplier is specified 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
1a9646739a [fixes][rename-field-name] drop_ship to is_drop_ship 2015-10-29 19:43:32 +05:30
Saurabh
98b287565a [enhance] close purchase order 2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Saurabh
5b7e9a1c94 [minor fixes] 2015-10-29 19:43:31 +05:30
Saurabh
c306b21415 [merge fixes] 2015-10-29 19:43:31 +05:30
Anand Doshi
21e09a2bd8 [enhancement] Ability to disable an Item 2015-10-29 12:39:47 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Nabin Hait
0045c305ac Period Closing Voucher as per multi currency 2015-10-22 16:21:37 +05:30
Anand Doshi
7c0eadb451 [fix] Patch template item to be shown in website, show variant's description and price on change of attribute 2015-10-20 17:30:02 +05:30
Neil Trini Lasrado
a4fad72a65 Considered greater precision of value and increment (better code) 2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
e65ac00f36 Considered greater precision of value and increment 2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
75bd0f7cfe Fixed issue in Item Variant for Numeric Attributes 2015-10-20 12:20:49 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Rushabh Mehta
14a908bdec [test] [fix] abs(valuation_rate) for moving average 2015-10-15 12:28:20 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Rushabh Mehta
86125b2b9f [fix] sales order status for maintenance 2015-10-13 12:31:05 +05:30
Nabin Hait
51e980dd2c [fix] Multiple minor fixes 2015-10-10 18:10:05 +05:30
Nabin Hait
bcd655a985 Merge pull request #4109 from rmehta/fix-sales-purchase-order-status 
[fix] sales & purchase order status
 2015-10-07 11:34:30 +05:30
Rushabh Mehta
0bc3ca02f3 [fix] default contact for website 2015-10-03 12:08:43 +05:30
Rushabh Mehta
d10ba853e6 [fix] sales & purchase order status 2015-10-02 17:16:51 +05:30
Anand Doshi
7afaeb0820 [fix] the case when party account currency is missing 2015-10-01 18:55:43 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Anand Doshi
6534ad082d Merge pull request #4069 from anandpdoshi/round-status-updater-percentages 
Round status update percentages to 2 decimals
 2015-09-28 19:40:01 +05:30
Rushabh Mehta
72b1128467 [fixes] accounts controller add flt 2015-09-28 17:29:46 +05:30
Anand Doshi
d970b001a4 [fix] Round status update percentages to 2 decimals 2015-09-28 16:52:22 +05:30
Rushabh Mehta
3d76686b82 [shopping-cart] cart via Jinja WIP 2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2 [cleanup] [wip] portal, shopping cart cleanup 2015-09-23 12:49:16 +05:30
Anand Doshi
53a0de7607 [fix] Recalculate rate after applying Pricing Rule 2015-09-22 15:26:53 +05:30
Anand Doshi
be6cfddc4d [hotfix] multicurrency gl entry 2015-09-17 21:07:04 +05:30
Anand Doshi
bf8c8df9ce Revert "[hotfix] set_balance_in_account_currency" 
This reverts commit 9acd6a2629.
 2015-09-17 20:55:50 +05:30
Anand Doshi
9acd6a2629 [hotfix] set_balance_in_account_currency 2015-09-17 20:29:31 +05:30
Anand Doshi
d4aa27cbb8 Merge pull request #4025 from anandpdoshi/split-emails 
use the new split_emails method to split emails by comma. Merge this after Communication CC is merged.
 2015-09-17 14:00:03 +05:30
Anand Doshi
c5f919eb68 [fix] use the new split_emails method to split emails by comma 2015-09-16 19:20:55 +05:30
Saurabh
5fe0086d9a [Fixes] Warehouse check while company delete & Variant Attribute value check 2015-09-16 16:59:24 +05:30
Anand Doshi
1fef2fad2d [minor] fixes in queries and payment tool 2015-09-14 18:27:21 +05:30
Anand Doshi
979326b0b1 minor fixes in multi-currency 2015-09-11 16:33:45 +05:30
Rushabh Mehta
d461d462aa [minor] rename notified_modifed > notified_update. Merge with #1296 2015-09-11 15:34:41 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd Multi-currency: Exchange Rate in Journal Entry 2015-09-09 18:43:12 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Anand Doshi
283850ce47 Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes 
Attributes in the variant should be in the same order as in the Template
 2015-09-02 16:09:09 +05:30
Anand Doshi
099bbbded0 Attributes in the variant should be in the same order as in the Template 
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
 2015-09-02 15:56:55 +05:30
Nabin Hait
e52ee553c0 Removed debug flag 2015-09-02 11:32:14 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Nabin Hait
4ffd7f3d05 Outstanding, paid and write-off amount in Invoice 2015-08-27 12:28:36 +05:30
Anand Doshi
fa65c7bf29 [minor] stopped or cancelled message 2015-08-26 19:15:24 +05:30
Rushabh Mehta
b6398be232 [minor] [fix] project query 2015-08-26 10:51:04 +05:30
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
Nabin Hait
b719c469c8 Allow different rate in Return Entry 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
Nabin Hait
895029dc15 Validate currency in transactions 2015-08-21 14:31:47 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b GL Entry in account currency 2015-08-21 14:31:47 +05:30
Nabin Hait
046db626a2 [fix] Fetch advances in Sales/Purchase Invoice 2015-08-21 12:34:41 +05:30
Nabin Hait
1826791891 [fix][patch] Reserved Qty logic fixed and reposted for existing items 2015-08-19 11:00:00 +05:30
Nabin Hait
0da11f1b10 [fix] Reset price list rate based on Pricing Rule type 2015-08-13 14:58:19 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
6dc40e9baf Update accounts_controller.py 2015-08-10 19:18:39 +05:30
bobzz-zone
b4c7bad33d Update buying_controller.py 
dont force change conversion factor
 2015-08-05 11:30:12 +07:00
Nabin Hait
0e1314c5b5 [fix] serial no validation in return entry 2015-08-04 15:22:48 +05:30
Nabin Hait
b7c0c55d61 Validate serial no in return entry with against document 2015-08-04 12:18:12 +05:30
Nabin Hait
5bbe823106 [patch] Fix outstanding amount for original invoice for return entry 2015-08-03 19:19:11 +05:30
Anand Doshi
da77abc25b Merge pull request #3767 from nabinhait/tax_calc 
[fix] Tax calculation while discount applied on net total
 2015-08-03 19:17:04 +05:30
Nabin Hait
db53a789be [fix] Tax calculation while discount applied on net total 2015-08-03 19:10:59 +05:30
Rushabh Mehta
b16b9cd7a0 [fix] force stock_uom in item and stock ledger entry 2015-08-03 16:13:33 +05:30
Nabin Hait
9e26bcfeeb [fix] Actual tax amount should be negative while creating return entry 2015-07-30 11:48:18 +05:30
Nabin Hait
453cc374d4 - Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice 
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
 2015-07-29 15:59:57 +05:30
Nabin Hait
e95c18a42d Merge pull request #3744 from nabinhait/return 
Sales / Purchase Return Improvements
 2015-07-29 15:51:34 +05:30
Nabin Hait
9117af3077 [fix] Uncheck Is POS option while creating return entry against POS Invoice 2015-07-29 15:40:59 +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
3fbbb71afc Added ability to freeze Customer/Supplier 2015-07-28 12:17:02 +05:30
Nabin Hait
3cf67a462b Cleanup and test cases for serialized item 2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360 Credit Note print format 2015-07-24 13:26:54 +05:30
Nabin Hait
246ed3f122 Test cases for sales return 2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a Minor fixes 2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Nabin Hait
0847f9a074 Reserved warehouse should not be validated on cancellation of sales order 2015-07-14 18:23:05 +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
Neil Trini Lasrado
ebb60f5dbc Fixed issues in Expired Batches while making Stock Entry 2015-07-08 15:24:02 +05:30
Nabin Hait
7580723ab3 Recurring docs should not consider Stopped documents and should be scheduled for hourly 2015-07-02 14:41:27 +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
93cdee4503 [fix] Escape values in queries 2015-06-27 12:51:00 +05:30
Nabin Hait
000835c454 [fix] Fiscal year issue due to missing field in Material Request 2015-06-08 12:10:43 +05:30
Nabin Hait
7cbd916b00 [fix] Fiscal year issue due to missing field in Material Request 2015-06-08 12:06:33 +05:30
Rushabh Mehta
c8b406d050 [fix] duplicate status for Submitted, Cancelled 2015-06-02 12:17:14 +05:30
Rushabh Mehta
a33d468d30 [fixes] portal, issues, addresses etc 2015-06-01 17:15:42 +05:30
Anand Doshi
ff8a854b82 Fixes #3349. Thanks @abelbm for reporting. 2015-05-26 18:13:28 -04:00
Nabin Hait
fd4bcd855b test case fixes 2015-05-22 16:55:55 +05:30
Nabin Hait
8252117fe5 set tax amount also in base currency after manipulation 2015-05-19 16:30:17 +05:30
Rushabh Mehta
9dd8aab211 [fix] status updater 2015-05-18 11:19:10 +05:30
Nabin Hait
1fe50120a3 minor fix 2015-05-16 12:14:54 +05:30
Nabin Hait
a6ee8290ce Inclusive tax for deduction and manipulation of tax amount to fix rounding issue 2015-05-15 12:02:27 +05:30
Nabin Hait
e6e456b373 message fixed 2015-05-13 17:21:44 +05:30
Nabin Hait
ffc7f3fef6 Apply default taxes on loading of document 2015-05-12 15:07:02 +05:30
Nabin Hait
574d5ff535 fetch only stock items as raw materials supplied for subcontracting 2015-05-07 16:29:29 +05:30
Nabin Hait
2b3e065efc [fix] taxes and charges input value 2015-05-05 16:33:58 +05:30
kressi
d1aa37f521 removed attributes from frappe is_website_user 2015-05-02 10:24:17 +02:00
Nabin Hait
c5b8f7eb46 fix in trends report 2015-04-30 16:13:46 +05:30
Nabin Hait
5616ff417c Account type Temporary and removed Aging Date field from all documents 2015-04-27 18:08:51 +05:30
Rushabh Mehta
50ce9753e0 [minor] added cache in get_value 2015-04-27 13:13:50 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Nabin Hait
ddaedefb32 minor fix for fieldname 2015-04-17 15:01:41 +05:30
Rushabh Mehta
9e6812cfab Merge pull request #3108 from BhupeshGupta/fix_bank_reports 
Add/Fix Bank Reports Filters
 2015-04-17 14:17:22 +05:30
bhupeshg2
e2e973f7be Add reqd to bank clearance aummary report 
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
 2015-04-14 23:09:32 +05:30
Rushabh Mehta
4ac3094049 [opportunity] status open 2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729 [opportunity] status open 2015-04-13 16:51:27 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Anand Doshi
a0630671da [hotfix] batch query 2015-04-09 13:34:57 +05:30
Anand Doshi
03cf407574 [fix] removed print 2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789 fixes to test cases 2015-04-06 19:29:16 +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
Anand Doshi
731b15edf4 [hotfix] taxes and totals 2015-04-05 20:09:09 +05:30
Nabin Hait
54c865e77c Landed cost voucher: fixes for serialized item 2015-03-27 15:39:06 +05:30
Nabin Hait
2ed71bac20 Batch related cleanup 2015-03-20 15:06:30 +05:30
Anand Doshi
2b2b639492 fixes 2015-03-20 14:29:23 +05:30
Anand Doshi
9d8154dd40 fixed test cases 2015-03-18 16:22: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
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
Nabin Hait
e2f054cc27 transaction date issue in pricing rule fixed 2015-03-09 14:54:37 +05:30
Anand Doshi
ec5ec60764 Fixed Test Cases 2015-03-05 19:31:40 +05:30
Nabin Hait
95ff2d4fed discount loss adjustment in base currency 2015-03-04 16:02:21 +05:30
Nabin Hait
25bd84dfcc Discount amount loss adjustment if no taxes or discount applied on net total 2015-03-04 15:07:17 +05:30
Rushabh Mehta
2cc585f180 [git fixes] salary manager, time log title, notificaitons 2015-03-03 16:06:54 +05:30
Rushabh Mehta
e693f794f5 [subcontract] refactor, make stock entry from PO 2015-03-03 15:50:24 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Nabin Hait
86cd4cc739 discount related fix 2015-02-28 19:12:55 +05:30
Nabin Hait
bc6c360bf1 Update accounts_controller.py 2015-02-27 23:40:56 +05:30
Rushabh Mehta
6cdfd1e976 [fix] patches 2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2 [taxes and charges] refactor 2015-02-25 15:08:57 +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
Rushabh Mehta
b620fed762 [fixes] [minor] 2015-02-24 16:51:22 +05:30
Nabin Hait
72c359afa2 valuation type charges can not be inclusive 2015-02-24 16:05:19 +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
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
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Sambhaji Kolate
973f78e7d3 fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802 2015-02-20 13:09:39 +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
Rushabh Mehta
8bb6e530c7 [fixes] accounts, stock changes 2015-02-18 20:22:59 +05:30
Nabin Hait
9252002249 Update taxes_and_totals.py 2015-02-18 18:48:30 +05:30
Nabin Hait
89c050e67d removed print 2015-02-18 16:19:07 +05:30
Nabin Hait
8626d3881d fixed renaming patch 2015-02-18 15:10:29 +05:30
Nabin Hait
fe81da2dd1 listview indicator fix 2015-02-18 12:23:18 +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
Nabin Hait
3237c75d98 Commonified taxes and totals calculation in server side 2015-02-17 11:11:11 +05:30
Rushabh Mehta
46e03eadca [rename] Customer Issue -> Warranty Claim 2015-02-17 10:45:50 +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
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
Nabin Hait
5e13e0c316 net_total and grand_total mismatch issue 2015-02-05 17:18:03 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Rushabh Mehta
c567e8e960 [fix] analytics reports + remove print item tables #2667 2015-02-03 17:56:25 +05:30
Nabin Hait
9c47efb592 Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts 2015-01-21 16:22:45 +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
7778b480fd fix reposting gl entries for future vouchers 2015-01-07 15:45:10 +05:30
Anand Doshi
7b34ebe89d [minor] Translated status change comment 2015-01-07 15:41:47 +05:30
Nabin Hait
e24365f1f4 message fix 2015-01-06 12:57:23 +05:30
Nabin Hait
8a00319962 minor fix 2015-01-04 17:27:40 +05:30
Nabin Hait
f40ce616a7 In stock entry, difference account can be non-profit-and-loss account 2015-01-02 14:37:01 +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
a74468b353 set missing cost center using default 2014-12-30 18:33:52 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 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
Anand Doshi
f87a622ef0 [minor] use frappe.attach_print() in salary slip and recurring document 2014-12-15 23:14:35 +05:30
ankitjavalkarwork
5edae0e47b [#2314] Add selectable BOM field for Subcontracted Item 2014-12-04 15:54:54 +05:30
Nabin Hait
cc11045fd3 minor fix 2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +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
Nabin Hait
5288bdeabb Minor fix 2014-11-03 15:08:21 +05:30
Rushabh Mehta
39dbf73de7 [merge] item-variants 2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35 Merge pull request #2231 from rmehta/item-variants 
Item variants
 2014-10-21 12:38:16 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315 Guess valuation rate in case of negative stock 2014-10-15 11:34:40 +05:30
Nabin Hait
38d0ed9f3a Negative stock allowed for perpetual inventory. Blocked in specific case 2014-10-14 16:08:19 +05:30
Nabin Hait
bc8b20ae3c Allocate entire advance amount if advance against SO/PO 2014-10-13 10:48:26 +05:30
Nabin Hait
4d74216147 Maintain negative stock balance if balance qty is negative 2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d [#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues 2014-10-09 17:31:46 +05:30
Nabin Hait
fce2881de6 minor fix 2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557 stock reco and repost vouchers 2014-10-08 18:06:14 +05:30
Nabin Hait
6c48ef781b Utility: Repost stock ledger entries and gl entries for all stock transactions 2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b Block negative stock in perpetual inventory 2014-10-08 11:02:18 +05:30
Rushabh Mehta
c62b6a815b [tests] fixes to stock entry 2014-10-07 17:15:30 +05:30
Rushabh Mehta
724f9e57e3 [item-variants] get table values from template if not set in variant #2224 2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a [fix][#1769] Add disable option to Sales/Purchase Tax Master with validation 2014-10-07 14:44:37 +05:30
Rushabh Mehta
ef276045c4 [item variants] make variants, bom updates 2014-10-07 11:40:47 +05:30
Nabin Hait
997a7a1d3e Test case fixes 2014-10-06 13:15:21 +05:30
Nabin Hait
3225102eb9 Update outstanding amt based on party 
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
 2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774 posted party in gl entry and multiple other fixes 2014-10-06 13:06:11 +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
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Rushabh Mehta
e1446eb516 [fix] quotation status 2014-09-29 14:09:50 +05:30
Rushabh Mehta
20fa996dfa [fix] quotation status 2014-09-29 13:58:40 +05:30
Rushabh Mehta
66e08e39f7 [fix] currency moved to frappe 2014-09-29 12:17:03 +05:30
Nabin Hait
b9e04815f8 Repost gl entries for future stock vouchers 2014-09-26 14:24:42 +05:30
Anand Doshi
32a9dfd983 Merge branch 'sbkolate-develop' into develop 2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343 Fixes for recurring document 2014-09-21 19:45:49 +05:30
Nabin Hait
7c831c3fe5 Get advance in sales/purchase invoice 2014-09-19 14:31:49 +05:30
Nabin Hait
48f5fa69f3 Fetch and validate advance entries in sales/purchase invoice 2014-09-18 15:04:11 +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
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Sambhaji Kolate
f37d4337a4 fix test for purchase order 2014-09-15 13:37:46 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +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
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Sambhaji Kolate
b14401c320 change convert_to_recurring() to take recurring_id dynamicaly 2014-09-11 16:09:05 +05:30
Sambhaji Kolate
b2a3f2d386 some minor changes get fixed for PO/PI 2014-09-10 17:40:48 +05:30
Sambhaji Kolate
e3d2643f2b Changes for Recurring PO/PI 2014-09-10 13:07:59 +05:30
Nabin Hait
fa18e7c21f Merge pull request #2140 from nathando/patch-1 
get_item_list does not [item qty=0]
 2014-09-09 12:06:21 +05:30
Nabin Hait
91fb661d12 minor fixes 2014-09-05 14:56:24 +05:30
nathando
247e9ffc96 get_item_list does not [item qty=0] 
- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note 
- Should be changed to `if d.qty is None` 

Use case for empty DN: 
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times).
 2014-09-03 15:03:31 +08:00
ankitjavalkarwork
737d8e4d9f fix minor issue and set default value send as pdf 2014-09-01 16:22:56 +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
e60822b094 Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
ac085e0f59 Add manage_recurring_documents and path to hooks, fix minor issues 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3 Commonify Recurring Sales Order/Invoice 2014-09-01 16:20:59 +05:30
Nabin Hait
14b8af2e65 Rounding issue fixed for bom quantity 2014-08-29 11:50:58 +05:30
Anand Doshi
913c51b1f8 [fix] get future vouchers query 2014-08-27 22:09:15 +05:30
Nabin Hait
cabf9c5bee Minor fix in status updater 2014-08-21 16:44:32 +05:30
Nabin Hait
f71011aff0 Project query fixed 2014-08-21 11:34:31 +05:30
Rushabh Mehta
cb067aa579 [route] refactor, wip 2014-08-20 11:44:30 +05:30
Rushabh Mehta
354acf6fc9 Merge pull request #2076 from anandpdoshi/anand-august-19 
[fix] Error Reports
 2014-08-19 14:07:03 +05:30
Nabin Hait
0a35effe49 Precision issue in tax calculation 2014-08-19 13:22:19 +05:30
Anand Doshi
78b6366325 [fix] Error Reports 2014-08-19 12:20:48 +05:30
Nabin Hait
c41a9480b8 Credit limit fixes 2014-08-18 15:40:36 +05:30
Rushabh Mehta
ab8bde0149 [ux] added folds, show actual / projected qty in pos 2014-08-14 11:43:46 +05:30
nabinhait
cc0692d714 landed cost fix 2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e Landed Cost on_submit and gl entries for PR 2014-08-11 16:12:31 +05:30
Nabin Hait
a6b597a0bd Fixes in Order trends report 2014-08-11 11:54:37 +05:30
Rushabh Mehta
b5e768906a built item grids for sales, purchase, stock 2014-08-08 11:56:31 +05:30
Anand Doshi
8f49cf7c03 [minor] fixed testcase 2014-07-25 13:02:29 +05:30
Anand Doshi
62b1cbf003 [impact] Limit available functions in jinja environment 2014-07-25 13:02:29 +05:30
Rushabh Mehta
5b51cc86a9 many fixes to print 2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c cleanup for print format 2014-07-25 13:01:52 +05:30
Anand Doshi
7fcb3c9865 [minor] Item query - search by description 2014-07-21 17:51:32 +05:30
nabinhait
711e8bec3d Fixes overflow tolerance 2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67 Fixes overflow tolerance 2014-07-19 16:53:45 +05:30
nabinhait
614fb750b7 set qty as per stock uom in entire purchase cycle 2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f Expense account can be liability account for stock reconciliation 2014-07-14 10:48:11 +05:30
nabinhait
d5fb5d91e9 overflow validation fixed 2014-07-10 15:27:27 +05:30
Anand Doshi
48d3b54e02 Fixes in queries 2014-07-09 13:15:03 +05:30
nabinhait
ff2cc1626e Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list 2014-07-08 15:30:25 +05:30
Anand Doshi
80a988c04f BugFix: selling_controller.py 2014-07-07 11:35:54 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
nabinhait
23cce731ab Fixes in action, not defined if called from outside document class 2014-07-03 12:25:06 +05:30
Rushabh Mehta
c53efc0d6c fix status_updater - update delivery status in Sales Order from Sales Invoice 2014-07-01 18:42:30 +05:30
Anand Doshi
4aa2380de2 Fixed get_sender for Sales and Jobs 2014-06-30 12:19:22 +05:30
Nabin Hait
00778c9a1e Validate expense account for perpetual inventory 2014-06-25 19:12:24 +05:30
Anand Doshi
a740f750c7 Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return 2014-06-25 13:31:02 +05:30
Anand Doshi
faefeaa644 Warehouse query filtered by company 2014-06-24 18:53:04 +05:30
Rushabh Mehta
864d1ea87f fix end of life query for item 2014-06-23 12:20:39 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Anand Doshi
496123a646 Inventory Accounting: Cost Center only required for Expense Account 2014-06-19 19:25:19 +05:30
Nabin Hait
98d9d797fd Tax category validation ignored in material request 2014-06-16 15:54:05 +05:30
Nabin Hait
e1b2b3e995 Account common get_query 2014-06-16 15:03:36 +05:30
Anand Doshi
ccf370f813 Fixed item query 2014-06-16 13:50:11 +05:30
Anand Doshi
0521814dea Fixed item query 2014-06-16 13:25:20 +05:30
Rushabh Mehta
6def968c3c minor fix for outgoing communication email 2014-06-12 10:31:43 +05:30
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
Nabin Hait
c3d1d6a946 cleanup raw materials supplied table for sub-contraction. Fixes #1743 2014-06-04 19:00:56 +05:30
Nabin Hait
cb9bdf43f6 over billing validation fixed 2014-05-30 11:22:16 +05:30
Nabin Hait
c3cbe2a30c minor fixes in sales invoice validation 2014-05-30 11:22:13 +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
08dd6af446 Update status based on communication. Fixes #1682 2014-05-26 15:06:42 +05:30
Pratik Vyas
e35a1025c9 hotfix: communication email bug 2014-05-22 18:37:55 +05:30
Nabin Hait
85786f3071 Support ticket / lead status based on communication. Fixes #1645 2014-05-19 19:31:40 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
966edff222 minor fix 2014-05-09 10:54:12 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
23649c6852 fixe in query.py 2014-05-07 19:18:15 +05:30
Nabin Hait
90f2d8d9fc minor fix 2014-05-07 14:55:09 +05:30
Anand Doshi
69e0cb5d6f Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573 2014-05-04 19:37:45 +05:30
Nabin Hait
296d626e53 Back flush issue fixed in sub contracting #1567 2014-05-02 17:36:13 +05:30
Nabin Hait
2cebf9b499 minor fix #1565 2014-05-02 16:12:07 +05:30
Nabin Hait
6b03914731 asynchronus issue in get_party_details 2014-05-02 15:45:10 +05:30
Nabin Hait
1e6c32e95f Address and contact creation from opportunity #1570 2014-05-02 11:42:24 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Nabin Hait
5b98340d15 payment to invoice matching 2014-05-01 15:43:22 +05:30
Nabin Hait
613919325d Fixes in link field queries 2014-04-30 20:30:33 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Anand Doshi
ac32bad25a Fixes in Taxes, Quotation and Address Territory 2014-04-18 01:32:02 +05:30
Anand Doshi
de1a97d506 Fixes get_voucher_detail for Stock Reconcilation 2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce Fixes in Production, Stock Entry and Stock Controller 2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e refactor get_voucher_details in stock_controller 2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688 production order: test fixed and added in test_stock_entry.py 2014-04-16 19:20:11 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4 
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
 2014-04-16 15:26:42 +05:30
Nabin Hait
a0c239db8d perpetual inventory fix related to sub-contracting 
Cherry-picked and modified by @anandpdoshi

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py
 2014-04-16 15:23:10 +05:30
Rushabh Mehta
82d8a637ac #1252 2014-04-16 09:20:00 +05:30
Rushabh Mehta
8a40c136ce more message fixing 2014-04-15 16:31:20 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices frappe/frappe#478 2014-04-11 16:51:27 +05:30
Pratik Vyas
f7daab7393 pass only valid columns to get_item_details 2014-04-10 17:53:30 +05:30
Anand Doshi
233fbb08b2 Minor fix 2014-04-10 12:53:16 +05:30
Anand Doshi
9fd50bcfb6 Fixed rest of the test cases frappe/frapp#478 2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d Fixed Test Cases frappe/frappe#478 2014-04-08 20:15:22 +05:30
Anand Doshi
2ce39cf770 Fixed Stock Entry Test Cases frappe/frappe#478 2014-04-07 18:51:58 +05:30
Nabin Hait
dc82d4f0cd frappe/frappe#478 fixes 2014-04-07 12:02:57 +05:30
Nabin Hait
312ba99e71 frappe/frappe#478 fixes 2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf frappe/frappe#478 fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812 frappe/frappe#478 removed more instances of doclist 2014-04-03 12:38:42 +05:30
Rushabh Mehta
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1 frappe/frappe#478 2014-04-02 15:03:35 +05:30
Rushabh Mehta
f2227d033c frappe/frappe#478, removed instances of .fields 2014-03-31 23:37:40 +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
81ba0b29da frappe/frappe#478 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
67d6a4e3aa Merge remote-tracking branch 'frappe/develop' into model-cleanup 
Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py
 2014-03-28 13:41:59 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Nabin Hait
becf75d791 Perpetual inventory cleanup 2014-03-27 17:18:29 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 #478 2014-03-27 14:17:33 +05:30
Nabin Hait
2c517e0a62 Fixes related to countrywise coa 2014-03-25 18:28:49 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30
Nabin Hait
49a6f0754e Removed debit_or_credit field 2014-03-21 11:22:38 +05:30
Nabin Hait
4d713ac5ba sql injection fixes 2014-03-21 11:22:37 +05:30
Anand Doshi
4b2692182a Fixes after change in fields handling in Document 2014-03-19 16:58:42 +05:30
Rushabh Mehta
2e7ad8980c fix for queries 2014-03-06 12:28:47 +05:30
Rushabh Mehta
4541875c81 removed searchfield condition from get_match_cond frappe/erpnext#1457 2014-03-06 11:19:46 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Anand Doshi
4362443b6e Propagate ignore_permissions during mapping from quotation to sales order 2014-02-25 15:42:32 +05:30
Nabin Hait
2f8d4451f5 calculate outstanding amount in server side, only if docstatus is 0 2014-02-20 14:59:37 +05:30
Nabin Hait
9d1f077922 get lead details in quotation 2014-02-19 17:43:24 +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
0aa71a5c41 minor fixes 2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a Rename fields: amount related fields 2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21 Field Rename: rate field mass replacement 2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4 Rename fields: initial commit 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
Rushabh Mehta
cc008cc109 commonified get_party_details 2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233 merge 2014-02-03 14:49:53 +05:30
Akhilesh Darjee
4cdb79941b map charge to taxes and charges in transactions 2014-01-30 13:56:57 +05:30
Akhilesh Darjee
4f7215662d webnotes/erpnext#1090 set default tax type in customer and supplier 2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17 more updates to party 2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4 changed fieldname from charge to taxes 2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597 Merged with 4.0-wip 2014-01-28 15:52:25 +05:30
Nabin Hait
4ba95d0b7a Fix in testcases 2014-01-23 16:45:22 +05:30
Nabin Hait
5ae6a61c4d Fixes related to appifing shopping cart 2014-01-23 15:33:30 +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
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Rushabh Mehta
b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions 2014-01-02 11:47:23 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +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
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
2b08985e16 Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:48 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30